HBASE-16611 Flakey org.apache.hadoop.hbase.client.TestReplicasClient.testCancelOfMultiGet

Branch-1 port of HBASE-16611.v2.patch
This commit is contained in:
Andrew Purtell 2017-09-13 18:08:54 -07:00
parent 42b797aa2b
commit d2e6f55cc5
1 changed files with 2 additions and 2 deletions

View File

@ -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);
}
}