Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8073: Solr fails to start on Windows with obscure errors when using relative path 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1716446 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2015-11-25 15:51:56 +00:00
parent bfffa7e0df
commit 77d89d6037
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -419,6 +419,9 @@ Bug Fixes
* SOLR-8307: Fix XXE vulnerability in MBeansHandler "diff" feature (Erik Hatcher)
* SOLR-8073: Solr fails to start on Windows with obscure errors when using relative path.
(Alexandre Rafalovitch, Ishan Chattopadhyaya via shalin)
Optimizations
----------------------

6
solr/bin/solr.cmd
View File

@ -609,11 +609,11 @@ IF NOT "%EXAMPLE%"=="" goto run_example
:start_solr
IF "%SOLR_HOME%"=="" set "SOLR_HOME=%SOLR_SERVER_DIR%\solr"
IF EXIST "%cd%\%SOLR_HOME%" set "SOLR_HOME=%cd%\%SOLR_HOME%"
IF NOT EXIST "%SOLR_HOME%\" (
IF EXIST "%SOLR_SERVER_DIR%\%SOLR_HOME%" (
set "SOLR_HOME=%SOLR_SERVER_DIR%\%SOLR_HOME%"
) ELSE IF EXIST "%cd%\%SOLR_HOME%" (
set "SOLR_HOME=%cd%\%SOLR_HOME%"
) ELSE (
set "SCRIPT_ERROR=Solr home directory %SOLR_HOME% not found!"
goto err
@ -1240,4 +1240,4 @@ REM Safe echo which does not mess with () in strings
set "eout=%1"
set eout=%eout:"=%
echo !eout!
GOTO :eof
GOTO :eof