IGNITE-14794 (minor) Cleanup.

Author: xtern

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

@@ -137,7 +137,7 @@ public class SnapshotRestoreProcess {
      * Future to be completed when the cache restore process is complete. By default, this is a stub.
      * When the process is started the future is recreated on the initiator node and passed to the user.
      */
-    private volatile ClusterSnapshotFuture fut = new ClusterSnapshotFuture();
+    private volatile ClusterSnapshotFuture fut;
 
     /** Current snapshot restore operation context (will be {@code null} when the operation is not running). */
     private volatile SnapshotRestoreContext opCtx;
@@ -349,7 +349,7 @@ public IgniteFuture<Void> start(String snpName, @Nullable Collection<String> cac
 
         ClusterSnapshotFuture fut0 = fut;
 
-        return fut0.isDone() ? null : fut0.name;
+        return fut0 != null ? fut0.name : null;
     }
 
     /**
@@ -413,6 +413,15 @@ public Set<UUID> cacheStartRequiredAliveNodes(IgniteUuid reqId) {
         return new HashSet<>(opCtx0.nodes());
     }
 
+    /**
+     * Finish local cache group restore process.
+     *
+     * @param reqId Request ID.
+     */
+    private void finishProcess(UUID reqId) {
+        finishProcess(reqId, null);
+    }
+
     /**
      * Finish local cache group restore process.
      *
@@ -436,7 +445,9 @@ else if (log.isInfoEnabled())
         synchronized (this) {
             ClusterSnapshotFuture fut0 = fut;
 
-            if (!fut0.isDone() && reqId.equals(fut0.rqId)) {
+            if (fut0 != null && reqId.equals(fut0.rqId)) {
+                fut = null;
+
                 ctx.pools().getSystemExecutorService().submit(() -> {
                     fut0.endTime = U.currentTimeMillis();
 
@@ -475,7 +486,7 @@ public IgniteFuture<Boolean> cancel(IgniteCheckedException reason, String snpNam
         synchronized (this) {
             opCtx0 = opCtx;
 
-            if (!fut.isDone() && fut.name.equals(snpName)) {
+            if (fut != null && fut.name.equals(snpName)) {
                 fut0 = fut;
 
                 fut0.interruptEx = reason;
@@ -587,7 +598,7 @@ private IgniteInternalFuture<SnapshotRestoreOperationResponse> prepare(SnapshotO
 
                 ClusterSnapshotFuture fut0 = fut;
 
-                if (!fut0.isDone() && fut0.interruptEx != null)
+                if (fut0 != null && fut0.interruptEx != null)
                     opCtx0.errHnd.accept(fut0.interruptEx);
             }