Author: rakeshr
Date: Mon Oct 26 07:10:16 2015
New Revision: 1710516
URL: http://svn.apache.org/viewvc?rev=1710516&view=rev
Log:
ZOOKEEPER-2239: JMX State from LocalPeerBean incorrect (Kevin Lee via rakeshr)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LocalPeerBean.java
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1710516&r1=1710515&r2=1710516&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Mon Oct 26 07:10:16 2015
@@ -33,6 +33,8 @@ BUGFIXES:
ZOOKEEPER-1460: IPv6 literal address not supported for quorum members
(Joseph Walton via cnauroth)
+ ZOOKEEPER-2239: JMX State from LocalPeerBean incorrect (Kevin Lee via
rakeshr)
+
IMPROVEMENTS:
ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests
Modified:
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LocalPeerBean.java
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LocalPeerBean.java?rev=1710516&r1=1710515&r2=1710516&view=diff
==============================================================================
---
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LocalPeerBean.java
(original)
+++
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/quorum/LocalPeerBean.java
Mon Oct 26 07:10:16 2015
@@ -66,7 +66,7 @@ public class LocalPeerBean extends Serve
}
public String getState() {
- return peer.getState().toString();
+ return peer.getServerState();
}
public String getQuorumAddress() {
