From d6f3c5b45ebd351210d62583685ab75142ee4f32 Mon Sep 17 00:00:00 2001 From: chenheng Date: Mon, 12 Sep 2016 19:44:46 +0800 Subject: [PATCH] HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet --- .../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 c5745e9..f67f534 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 @@ -756,7 +756,7 @@ class AsyncProcess { @Override public void run() { - MultiResponse res; + MultiResponse res = null; CancellableRegionServerCallable callable = currentCallable; try { // setup the callable based on the actions, if we don't have one already from the request @@ -795,7 +795,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.9.3