Repository: hbase Updated Branches: refs/heads/branch-1 81d04cde2 -> ca6c7f0a6
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/ca6c7f0a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ca6c7f0a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ca6c7f0a Branch: refs/heads/branch-1 Commit: ca6c7f0a6857a5ac16be6a13c461e2aae0b51821 Parents: 81d04cd Author: tedyu <[email protected]> Authored: Mon Sep 21 07:23:47 2015 -0700 Committer: tedyu <[email protected]> Committed: Mon Sep 21 07:23:47 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/ca6c7f0a/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",
