lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r1716446 - in /lucene/dev/trunk/solr: CHANGES.txt bin/solr.cmd
Date Wed, 25 Nov 2015 15:51:56 GMT
Author: shalin
Date: Wed Nov 25 15:51:56 2015
New Revision: 1716446

URL: http://svn.apache.org/viewvc?rev=1716446&view=rev
Log:
SOLR-8073: Solr fails to start on Windows with obscure errors when using relative path

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/bin/solr.cmd

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1716446&r1=1716445&r2=1716446&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Nov 25 15:51:56 2015
@@ -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
 ----------------------
 

Modified: lucene/dev/trunk/solr/bin/solr.cmd
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr.cmd?rev=1716446&r1=1716445&r2=1716446&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr.cmd (original)
+++ lucene/dev/trunk/solr/bin/solr.cmd Wed Nov 25 15:51:56 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



Mime
View raw message