Author: kturner
Date: Wed May 30 17:23:41 2012
New Revision: 1344358
URL: http://svn.apache.org/viewvc?rev=1344358&view=rev
Log:
ACCUMULO-601 made the master advertise an IP addr in zookeeper
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1344358&r1=1344357&r2=1344358&view=diff
==============================================================================
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
Wed May 30 17:23:41 2012
@@ -2157,7 +2157,8 @@ public class Master implements LiveTServ
};
long current = System.currentTimeMillis();
final long waitTime =
getSystemConfiguration().getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT);
- final String masterClientAddress = hostname + ":" +
getSystemConfiguration().getPort(Property.MASTER_CLIENTPORT);
+ final String masterClientAddress =
org.apache.accumulo.core.util.AddressUtil.toString(new
InetSocketAddress(hostname, getSystemConfiguration().getPort(
+ Property.MASTER_CLIENTPORT)));
boolean locked = false;
while (System.currentTimeMillis() - current < waitTime) {
