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

Posted to commits@zookeeper.apache.org by rg...@apache.org on 2015/12/10 06:28:45 UTC

svn commit: r1719012 - in /zookeeper/branches/branch-3.5: CHANGES.txt bin/zkServer.sh

Author: rgs
Date: Thu Dec 10 05:28:45 2015
New Revision: 1719012

URL: http://svn.apache.org/viewvc?rev=1719012&view=rev
Log:
ZOOKEEPER-2340: JMX is disabled even if JMXDISABLE is false
(Arshad Mohammad via rgs)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/bin/zkServer.sh

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1719012&r1=1719011&r2=1719012&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Thu Dec 10 05:28:45 2015
@@ -86,6 +86,9 @@ BUGFIXES:
   ZOOKEEPER-2295: TGT refresh time logic is wrong
   (Arshad Mohammad via rgs)
 
+  ZOOKEEPER-2340: JMX is disabled even if JMXDISABLE is false
+  (Arshad Mohammad via rgs)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests

Modified: zookeeper/branches/branch-3.5/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/bin/zkServer.sh?rev=1719012&r1=1719011&r2=1719012&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/bin/zkServer.sh (original)
+++ zookeeper/branches/branch-3.5/bin/zkServer.sh Thu Dec 10 05:28:45 2015
@@ -42,7 +42,7 @@ then
     JMXLOCALONLY=false
 fi
 
-if [ "x$JMXDISABLE" = "x" ]
+if [ "x$JMXDISABLE" = "x" ] || [ "$JMXDISABLE" = 'false' ]
 then
   echo "ZooKeeper JMX enabled by default" >&2
   if [ "x$JMXPORT" = "x" ]