Merge pull request #6254 from chrisrueger/6199-fix-npe-in-stop

Fix NPE in JavaSearchStartupParticipant.stop() during Eclipse shutdown

bndtools.core/src/bndtools/javasearch/JavaSearchStartupParticipant.java

@@ -51,7 +51,13 @@ private void createBndtoolsJavaWorkingSet() {
 
 	@Override
 	public void stop() {
-		NewSearchUI.removeQueryListener(this);
+		Display current = Display.getCurrent();
+		if (current != null) {
+			current.syncExec(() -> {
+				NewSearchUI.removeQueryListener(this);
+			});
+		}
+
 	}
 
 	@Override