hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-14431 Addendum checks for null connectionInPool (Yu Li)
Date Mon, 21 Sep 2015 14:24:18 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 34032492d -> 78c8c772d


HBASE-14431 Addendum checks for null connectionInPool (Yu Li)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/78c8c772
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/78c8c772
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/78c8c772

Branch: refs/heads/branch-1.2
Commit: 78c8c772db84d88dcecaafd6ba9c7f7e611cc091
Parents: 3403249
Author: tedyu <yuzhihong@gmail.com>
Authored: Mon Sep 21 07:24:08 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Mon Sep 21 07:24:08 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/78c8c772/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
index 876eb70..e1662f3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
@@ -403,7 +403,7 @@ public class AsyncRpcClient extends AbstractRpcClient {
       // we use address as cache key, so we should check here to prevent removing the
       // wrong connection
       AsyncRpcChannel connectionInPool = this.connections.get(connectionHashCode);
-      if (connectionInPool.equals(connection)) {
+      if (connectionInPool != null && connectionInPool.equals(connection)) {
         this.connections.remove(connectionHashCode);
       } else if (LOG.isDebugEnabled()) {
         LOG.debug(String.format("%s already removed, expected instance %08x, actual %08x",


Mime
View raw message