Author: rgs
Date: Sun Dec 6 20:37:20 2015
New Revision: 1718214
URL: http://svn.apache.org/viewvc?rev=1718214&view=rev
Log:
ZOOKEEPER-2304: JMX ClientPort from ZooKeeperServerBean incorrect
(Arshad Mohammad via rgs)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerBean.java
Modified: zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1718214&r1=1718213&r2=1718214&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sun Dec 6 20:37:20 2015
@@ -226,6 +226,9 @@ BUGFIXES:
ZOOKEEPER-2311: assert in setup_random
(Marshall McMullen via rgs)
+ ZOOKEEPER-2304: JMX ClientPort from ZooKeeperServerBean incorrect
+ (Arshad Mohammad via rgs)
+
IMPROVEMENTS:
ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed
Wanderman-Milne via shralex)
Modified:
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerBean.java
URL:
http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerBean.java?rev=1718214&r1=1718213&r2=1718214&view=diff
==============================================================================
---
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerBean.java
(original)
+++
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerBean.java
Sun Dec 6 20:37:20 2015
@@ -18,8 +18,6 @@
package org.apache.zookeeper.server;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.util.Date;
import org.apache.zookeeper.Version;
@@ -41,12 +39,7 @@ public class ZooKeeperServerBean impleme
}
public String getClientPort() {
- try {
- return InetAddress.getLocalHost().getHostAddress() + ":"
- + zks.getClientPort();
- } catch (UnknownHostException e) {
- return "localhost:" + zks.getClientPort();
- }
+ return Integer.toString(zks.getClientPort());
}
public String getName() {
