Index: security/src/main/java/org/apache/hadoop/hbase/ipc/SecureClient.java =================================================================== --- security/src/main/java/org/apache/hadoop/hbase/ipc/SecureClient.java (revision 80059) +++ security/src/main/java/org/apache/hadoop/hbase/ipc/SecureClient.java (working copy) @@ -412,9 +412,7 @@ // release the resources // first thing to do;take the connection out of the connection list synchronized (connections) { - if (connections.get(remoteId) == this) { - connections.remove(remoteId); - } + connections.remove(remoteId, this); } // close the streams and therefore the socket