Repository: hbase Updated Branches: refs/heads/branch-1 42b797aa2 -> d2e6f55cc refs/heads/branch-1.4 b55ae2d4a -> d12abb1ad
HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet Branch-1 port of HBASE-16611.v2.patch Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d2e6f55c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d2e6f55c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d2e6f55c Branch: refs/heads/branch-1 Commit: d2e6f55cc5f095f1e32cb97f27b03a4c8a6f0d44 Parents: 42b797a Author: Andrew Purtell <apurt...@apache.org> Authored: Wed Sep 13 18:08:54 2017 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Wed Sep 13 18:08:54 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/client/AsyncProcess.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d2e6f55c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java index 10d4f38..097206c 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java @@ -789,7 +789,7 @@ class AsyncProcess { @Override public void run() { - MultiResponse res; + MultiResponse res = null; PayloadCarryingServerCallable callable = currentCallable; try { // setup the callable based on the actions, if we don't have one already from the request @@ -828,7 +828,7 @@ class AsyncProcess { throw new RuntimeException(t); } finally { decTaskCounters(multiAction.getRegions(), server); - if (callsInProgress != null && callable != null) { + if (callsInProgress != null && callable != null && res != null) { callsInProgress.remove(callable); } }
