Skip to content

Commit 1105e3f

Browse files
committed
clean local request fix
1 parent df68043 commit 1105e3f

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCheckDistributedProcess.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -256,22 +256,22 @@ private void clean(
256256
}
257257

258258
/** */
259-
private Throwable stopAndCleanLocRequest(SnapshotCheckProcessRequest rq, @Nullable Throwable err) {
260-
if (requests.remove(rq.snapshotName()) != null) {
261-
if (err == null && rq.error() != null)
262-
err = rq.error();
259+
private Throwable stopAndCleanLocRequest(SnapshotCheckProcessRequest locRq, @Nullable Throwable err) {
260+
if (err == null && locRq.error() != null)
261+
err = locRq.error();
263262

264-
GridFutureAdapter<?> locWorkingFut = rq.fut();
263+
GridFutureAdapter<?> locWorkingFut = locRq.fut();
265264

266-
boolean finished = false;
265+
boolean finished = false;
267266

268-
// Try to stop local working future ASAP.
269-
if (locWorkingFut != null)
270-
finished = err == null ? locWorkingFut.onDone() : locWorkingFut.onDone(err);
267+
// Try to stop local working future ASAP.
268+
if (locWorkingFut != null)
269+
finished = err == null ? locWorkingFut.onDone() : locWorkingFut.onDone(err);
271270

272-
if (finished && log.isInfoEnabled())
273-
log.info("Finished snapshot local validation, req: " + rq + '.');
274-
}
271+
requests.remove(locRq.snapshotName());
272+
273+
if (finished && log.isInfoEnabled())
274+
log.info("Finished snapshot local validation, req: " + locRq + '.');
275275

276276
return err;
277277
}

0 commit comments

Comments
 (0)