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:23:25 GMT
Repository: hbase
Updated Branches:
  refs/heads/master bf8596013 -> 86cf14889


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/86cf1488
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/86cf1488
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/86cf1488

Branch: refs/heads/master
Commit: 86cf14889462b6947f921c41401a8f925fe2b3b6
Parents: bf85960
Author: tedyu <yuzhihong@gmail.com>
Authored: Mon Sep 21 07:23:14 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Mon Sep 21 07:23:14 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/86cf1488/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