Accepted unchanged data is still recorded into the result state.

apache · Aug 26, 2024 · fd5ec2e · fd5ec2e
1 parent bb42d71
commit fd5ec2e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/Reloader.java b/ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/Reloader.java
@@ -556,6 +556,11 @@ public void cancel(CancellationException cancelled) {
     }
 
     private CompletableFuture<ProjectReload.ProjectState> loadStepDone(ProjectStateData<?> state, LoadContextImpl fd, Throwable t) {
+        loadStepDone1(state, fd, t);
+        return processOne();
+    }
+
+    private void loadStepDone1(ProjectStateData<?> state, LoadContextImpl fd, Throwable t) {
         // record the returned data for subsequent rounds:
         if (t != null) {
             fd.reloadError = t;
@@ -571,7 +576,6 @@ private CompletableFuture<ProjectReload.ProjectState> loadStepDone(ProjectStateD
         LOG.log(Level.FINE, "{0} {1} loaded {2} with load-private data {3}", new Object[]{this, fd.impl, state, fd.contextData});
         currentStage = null;
         currentStageContext = null;
-        return processOne();
     }
 
     /**
@@ -656,6 +660,7 @@ synchronized CompletableFuture<ProjectReload.ProjectState> processOne() {
                 LOG.log(Level.FINE, "{0}: {1} rejected by {2}", new Object[]{this, d.loadedData, d.impl});
                 break;
             }
+            loadStepDone1(d.loadedData, d, null);
         }
         final LoadContextImpl fd = d;
         try {