You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/11/25 16:52:54 UTC
svn commit: r1716447 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/bin/ solr/bin/solr.cmd
Author: shalin
Date: Wed Nov 25 15:52:53 2015
New Revision: 1716447
URL: http://svn.apache.org/viewvc?rev=1716447&view=rev
Log:
SOLR-8073: Solr fails to start on Windows with obscure errors when using relative path
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/bin/ (props changed)
lucene/dev/branches/branch_5x/solr/bin/solr.cmd
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1716447&r1=1716446&r2=1716447&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Nov 25 15:52:53 2015
@@ -269,6 +269,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
----------------------
Modified: lucene/dev/branches/branch_5x/solr/bin/solr.cmd
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/bin/solr.cmd?rev=1716447&r1=1716446&r2=1716447&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/bin/solr.cmd (original)
+++ lucene/dev/branches/branch_5x/solr/bin/solr.cmd Wed Nov 25 15:52:53 2015
@@ -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 (
set "eout=%1"
set eout=%eout:"=%
echo !eout!
-GOTO :eof
\ No newline at end of file
+GOTO :eof