diff -uNr trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java HMtrunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java --- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1155226) +++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy) @@ -1167,7 +1167,7 @@ if (master) getMaster(); HRegionInterface server; String rsName = isa != null? - isa.toString(): Addressing.createHostAndPortStr(hostname, port); + Addressing.createHostAndPortStr(isa.getHostName(),isa.getPort()):Addressing.createHostAndPortStr(hostname, port); // See if we already have a connection (common case) server = this.servers.get(rsName); if (server == null) { @@ -1190,7 +1190,7 @@ serverInterfaceClass, HRegionInterface.VERSION, address, this.conf, this.maxRPCAttempts, this.rpcTimeout, this.rpcTimeout); - this.servers.put(address.toString(), server); + this.servers.put(Addressing.createHostAndPortStr(address.getHostName(),address.getPort()), server); } catch (RemoteException e) { LOG.warn("RemoteException connecting to RS", e); // Throw what the RemoteException was carrying.