From d12abb1ad8001bd84ce7175313cb41e33dea1c10 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Wed, 13 Sep 2017 18:08:54 -0700 Subject: [PATCH] HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet Branch-1 port of HBASE-16611.v2.patch --- .../src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 10d4f38a3b..097206c205 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); } } -- 2.13.4