Index: hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java (revision 1487216) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java (working copy) @@ -1466,10 +1466,9 @@ public boolean equals(Object obj) { if (obj instanceof ConnectionId) { ConnectionId id = (ConnectionId) obj; - return address.equals(id.address) && - ((ticket != null && ticket.equals(id.ticket)) || - (ticket == id.ticket)) && rpcTimeout == id.rpcTimeout && - this.serviceName == id.serviceName; + return address.equals(id.address) + && ((ticket != null && ticket.getUGI().hashCode() == id.ticket.getUGI().hashCode()) || (ticket == id.ticket)) + && rpcTimeout == id.rpcTimeout && this.serviceName == id.serviceName; } return false; } @@ -1478,7 +1477,7 @@ public int hashCode() { int hashcode = (address.hashCode() + PRIME * (PRIME * this.serviceName.hashCode() ^ - (ticket == null ? 0 : ticket.hashCode()) )) ^ + (ticket == null ? 0 : ticket.getUGI().hashCode()) )) ^ rpcTimeout; return hashcode; } @@ -1598,4 +1597,4 @@ this.isa, this.rpcTimeout); } } -} \ No newline at end of file +}