HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cd9f4223 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cd9f4223 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cd9f4223 Branch: refs/heads/hbase-12439 Commit: cd9f42237344756a7db395bd8241f41b00e359a2 Parents: 422734e Author: chenheng <chenh...@apache.org> Authored: Tue Sep 13 14:52:50 2016 +0800 Committer: chenheng <chenh...@apache.org> Committed: Tue Sep 13 14:52:50 2016 +0800 ---------------------------------------------------------------------- .../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/cd9f4223/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 1531201..93b17bc 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() { - AbstractResponse res; + AbstractResponse res = null; CancellableRegionServerCallable callable = currentCallable; try { // setup the callable based on the actions, if we don't have one already from the request @@ -802,7 +802,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); } }
