Repository: hbase Updated Branches: refs/heads/branch-1.1 36200f1ea -> 9ae6cead3
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/9ae6cead Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9ae6cead Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9ae6cead Branch: refs/heads/branch-1.1 Commit: 9ae6cead335c5afc298bd192820ecb7af928ab2c Parents: 36200f1 Author: tedyu <[email protected]> Authored: Mon Sep 21 07:24:39 2015 -0700 Committer: tedyu <[email protected]> Committed: Mon Sep 21 07:24:39 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/9ae6cead/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 80156d6..bb3f332 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 @@ -398,7 +398,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",
