You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@zookeeper.apache.org by cn...@apache.org on 2015/10/03 23:08:07 UTC

svn commit: r1706632 - in /zookeeper/branches/branch-3.5: CHANGES.txt bin/zkEnv.cmd

Author: cnauroth
Date: Sat Oct  3 21:08:06 2015
New Revision: 1706632

URL: http://svn.apache.org/viewvc?rev=1706632&view=rev
Log:
ZOOKEEPER-2281: ZK Server startup fails if there are spaces in the JAVA_HOME path (Neha Bathra via cnauroth)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/bin/zkEnv.cmd

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1706632&r1=1706631&r2=1706632&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sat Oct  3 21:08:06 2015
@@ -27,6 +27,9 @@ BUGFIXES:
   ZOOKEEPER-2268: Zookeeper doc creation fails on windows
   (Arshad Mohammad via cnauroth)
 
+  ZOOKEEPER-2281: ZK Server startup fails if there are spaces in the JAVA_HOME
+  path (Neha Bathra via cnauroth)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests

Modified: zookeeper/branches/branch-3.5/bin/zkEnv.cmd
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/bin/zkEnv.cmd?rev=1706632&r1=1706631&r2=1706632&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/bin/zkEnv.cmd (original)
+++ zookeeper/branches/branch-3.5/bin/zkEnv.cmd Sat Oct  3 21:08:06 2015
@@ -39,10 +39,12 @@ if not defined JAVA_HOME (
   goto :eof
 )
 
-if not exist %JAVA_HOME%\bin\java.exe (
+set JAVA_HOME=%JAVA_HOME:"=%
+
+if not exist "%JAVA_HOME%"\bin\java.exe (
   echo Error: JAVA_HOME is incorrectly set.
   goto :eof
 )
 
-set JAVA=%JAVA_HOME%\bin\java
+set JAVA="%JAVA_HOME%"\bin\java