--- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1155206) +++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1155207) @@ -1167,7 +1167,8 @@ public class HConnectionManager { if (master) getMaster(); HRegionInterface server; String rsName = isa != null? - isa.toString(): Addressing.createHostAndPortStr(hostname, port); + isa.toString():new InetSocketAddress(hostname, port).toString(); + //Addressing.createHostAndPortStr(hostname, port); // See if we already have a connection (common case) server = this.servers.get(rsName); if (server == null) {