浏览代码

ZOOKEEPER-2281: ZK Server startup fails if there are spaces in the JAVA_HOME path (Neha Bathra via cnauroth)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1706631 13f79535-47bb-0310-9956-ffa450edef68
Chris Nauroth 9 年之前
父节点
当前提交
86c1671a6e
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 3 0
      CHANGES.txt
  2. 4 2
      bin/zkEnv.cmd

+ 3 - 0
CHANGES.txt

@@ -184,6 +184,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-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)  
 

+ 4 - 2
bin/zkEnv.cmd

@@ -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