hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1516886 - /hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
Date Fri, 23 Aug 2013 15:30:03 GMT
Author: stack
Date: Fri Aug 23 15:30:03 2013
New Revision: 1516886

URL: http://svn.apache.org/r1516886
Log:
HBASE-9319 Apply 'HBASE-7685 Closing socket connection can't be removed from SecureClient'
to trunk

Modified:
    hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java

Modified: hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java?rev=1516886&r1=1516885&r2=1516886&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
(original)
+++ hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
Fri Aug 23 15:30:03 2013
@@ -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



Mime
View raw message