HBASE-9319 Apply 'HBASE-7685 Closing socket connection can't be removed from SecureClient' to trunk

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1516885 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-08-23 15:29:43 +00:00
parent 08247bfe76
commit 7a557f97b3
1 changed files with 3 additions and 5 deletions

View File

@ -951,9 +951,7 @@ public class RpcClient {
// 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
@ -1218,7 +1216,7 @@ public class RpcClient {
super(msg);
}
}
/**
* Construct an IPC cluster client whose values are of the {@link Message} class.
* @param conf configuration
@ -1274,7 +1272,7 @@ public class RpcClient {
public RpcClient(Configuration conf, String clusterId) {
this(conf, clusterId, NetUtils.getDefaultSocketFactory(conf), null);
}
/**
* Construct an IPC client for the cluster <code>clusterId</code> with the default SocketFactory
* @param conf configuration