Do refresh in workspace write lock

--- Signed-off-by: Peter Kriens <[email protected]> Signed-off-by: Peter Kriens <[email protected]>
pkriens · Dec 24, 2023 · 1eb30dd · 1eb30dd
1 parent 7294a89
commit 1eb30dd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java b/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java
@@ -1527,6 +1527,12 @@ public <T> T writeLocked(Callable<T> callable, long timeoutInMs) throws Exceptio
 		return workspaceLock.locked(workspaceLock.writeLock(), timeoutInMs, callable, () -> false);
 	}
 
+	public <T> void writeLocked(Runnable runnable) throws Exception {
+		writeLocked(() -> {
+			runnable.run();
+			return null;
+		});
+	}
 	public <T> T writeLocked(Callable<T> callable) throws Exception {
 		return workspaceLock.locked(workspaceLock.writeLock(), WORKSPACE_LOCK_DEFAULT_TIMEOUTMS, callable, () -> false);
 	}

diff --git a/...ore/src/org/bndtools/core/ui/wizards/service/AbstractNewBndServiceMultiProjectWizard.java b/...ore/src/org/bndtools/core/ui/wizards/service/AbstractNewBndServiceMultiProjectWizard.java
@@ -24,11 +24,13 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
@@ -40,6 +42,7 @@
 import org.eclipse.ui.ide.IDE;
 
 import aQute.bnd.build.Project;
+import aQute.bnd.build.Workspace;
 import aQute.bnd.build.model.BndEditModel;
 import bndtools.Plugin;
 import bndtools.central.Central;
@@ -297,16 +300,25 @@ public boolean performFinish() {
 					}
 				}
 			}
+
 			if (serviceApiEditor != null) {
 				getWorkbench().getActiveWorkbenchWindow()
 					.getActivePage()
 					.activate(serviceApiEditor);
 			}
-			// refresh whole workspace to update the inter-project relationships
-			try {
-				Central.getWorkspace()
-					.forceRefresh();
-			} catch (Exception e) {}
+
+			Job job = Job.create("refresh workspace", monitor -> {
+				Workspace workspace;
+				try {
+					workspace = Central.getWorkspace();
+					workspace.writeLocked(workspace::forceRefresh);
+				} catch (Exception e) {
+					throw new CoreException(Status.error("failed to refresh the workspace", e));
+				}
+			});
+			job.setRule(ResourcesPlugin.getWorkspace()
+					.getRoot());
+			job.schedule();
 		}
 		return result;
 	}