Browse Source

ZOOKEEPER-1376. zkServer.sh does not correctly check for $SERVER_JVMFLAGS (Skye W-M via henryr)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.3@1388719 13f79535-47bb-0310-9956-ffa450edef68
Henry Robinson 13 years ago
parent
commit
314a55237b
2 changed files with 7 additions and 1 deletions
  1. 6 0
      CHANGES.txt
  2. 1 1
      bin/zkServer.sh

+ 6 - 0
CHANGES.txt

@@ -1,3 +1,9 @@
+Release 3.3.7 - TBD
+Backward compatible changes:
+
+  ZOOKEEPER-1376. zkServer.sh does not correctly check for
+  $SERVER_JVMFLAGS (Skye W-M via henryr)
+
 Release 3.3.6 - 2012-08-01
 Release 3.3.6 - 2012-08-01
 Backward compatible changes:
 Backward compatible changes:
 
 

+ 1 - 1
bin/zkServer.sh

@@ -53,7 +53,7 @@ ZOOBINDIR=`dirname "$ZOOBIN"`
 
 
 . "$ZOOBINDIR"/zkEnv.sh
 . "$ZOOBINDIR"/zkEnv.sh
 
 
-if [ "x$SERVER_JVMFLAGS" ]
+if [ "x$SERVER_JVMFLAGS"  != "x" ]
 then
 then
     JVMFLAGS="$SERVER_JVMFLAGS $JVMFLAGS"
     JVMFLAGS="$SERVER_JVMFLAGS $JVMFLAGS"
 fi
 fi