[234409] Reinstate problematic suite from automated JUnits
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
index bca68a9..7c27b89 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
@@ -426,6 +426,14 @@
 	 * Blocks until the graph is finished updating
 	 */
 	public void waitForAllUpdates(IProgressMonitor monitor) {
+		if(graphUpdateJob.getThread() != Thread.currentThread()) {
+			try {
+				graphUpdateJob.join();
+			} catch (InterruptedException e) {
+				ModulecorePlugin.logError(e);
+			}
+		}
+			
 		if(graphUpdateJob.shouldSchedule()){
 			graphUpdateJob.run(monitor);
 		}