clean local request fix

apache · Jul 11, 2024 · 1105e3f · 1105e3f
1 parent df68043
commit 1105e3f
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/...gnite/internal/processors/cache/persistence/snapshot/SnapshotCheckDistributedProcess.java b/...gnite/internal/processors/cache/persistence/snapshot/SnapshotCheckDistributedProcess.java
@@ -256,22 +256,22 @@ private void clean(
     }
 
     /** */
-    private Throwable stopAndCleanLocRequest(SnapshotCheckProcessRequest rq, @Nullable Throwable err) {
-        if (requests.remove(rq.snapshotName()) != null) {
-            if (err == null && rq.error() != null)
-                err = rq.error();
+    private Throwable stopAndCleanLocRequest(SnapshotCheckProcessRequest locRq, @Nullable Throwable err) {
+        if (err == null && locRq.error() != null)
+            err = locRq.error();
 
-            GridFutureAdapter<?> locWorkingFut = rq.fut();
+        GridFutureAdapter<?> locWorkingFut = locRq.fut();
 
-            boolean finished = false;
+        boolean finished = false;
 
-            // Try to stop local working future ASAP.
-            if (locWorkingFut != null)
-                finished = err == null ? locWorkingFut.onDone() : locWorkingFut.onDone(err);
+        // Try to stop local working future ASAP.
+        if (locWorkingFut != null)
+            finished = err == null ? locWorkingFut.onDone() : locWorkingFut.onDone(err);
 
-            if (finished && log.isInfoEnabled())
-                log.info("Finished snapshot local validation, req: " + rq + '.');
-        }
+        requests.remove(locRq.snapshotName());
+
+        if (finished && log.isInfoEnabled())
+            log.info("Finished snapshot local validation, req: " + locRq + '.');
 
         return err;
     }