svn commit: r1358489 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java

[la...@apache.org]

Author: larsh
Date: Sat Jul  7 02:11:43 2012
New Revision: 1358489

URL: http://svn.apache.org/viewvc?rev=1358489&view=rev
Log:
HBASE-6313 Client hangs because the client is not notified (binlijin)

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java?rev=1358489&r1=1358488&r2=1358489&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java Sat Jul  7 02:11:43 2012
@@ -68,8 +68,8 @@ import org.apache.hadoop.util.Reflection
  */
 public class HBaseClient {
 
-  private static final Log LOG =
-    LogFactory.getLog("org.apache.hadoop.ipc.HBaseClient");
+  private static final Log LOG = LogFactory
+      .getLog("org.apache.hadoop.ipc.HBaseClient");
   protected final PoolMap<ConnectionId, Connection> connections;
 
   protected final Class<? extends Writable> valueClass;   // class of call values
@@ -572,7 +572,7 @@ public class HBaseClient {
 
         if (LOG.isDebugEnabled())
           LOG.debug(getName() + " got value #" + id);
-        Call call = calls.remove(id);
+        Call call = calls.get(id);
 
         // Read the flag byte
         byte flag = in.readByte();
@@ -597,6 +597,7 @@ public class HBaseClient {
             call.setValue(value);
           }
         }
+        calls.remove(id);
       } catch (IOException e) {
         if (e instanceof SocketTimeoutException && remoteId.rpcTimeout > 0) {
           // Clean up open calls but don't treat this as a fatal condition,