From f87240796e6584aac41479a8d4ba5b250abdd91c Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippert@acm.org>
Date: Wed, 29 Feb 2012 23:08:38 +0100
Subject: [PATCH] STS-2472: wrapping getResolvedClasspath into a job to avoid
 too broad locking

---
 .../core/java/ProjectClassLoaderCache.java    | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/plugins/org.springframework.ide.eclipse.core/src/org/springframework/ide/eclipse/core/java/ProjectClassLoaderCache.java b/plugins/org.springframework.ide.eclipse.core/src/org/springframework/ide/eclipse/core/java/ProjectClassLoaderCache.java
index a333ca34b4..2f16a42150 100644
--- a/plugins/org.springframework.ide.eclipse.core/src/org/springframework/ide/eclipse/core/java/ProjectClassLoaderCache.java
+++ b/plugins/org.springframework.ide.eclipse.core/src/org/springframework/ide/eclipse/core/java/ProjectClassLoaderCache.java
@@ -36,9 +36,11 @@
 import org.eclipse.core.resources.IResourceDeltaVisitor;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
 import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 import org.eclipse.jdt.core.ElementChangedEvent;
@@ -124,7 +126,7 @@ private static void addClassPathUrls(IProject project, List<URL> paths, Set<IPro
 			if (JdtUtils.isJavaProject(project)) {
 				IJavaProject jp = JavaCore.create(project);
 				// configured classpath
-				IClasspathEntry[] classpath = jp.getResolvedClasspath(true);
+				IClasspathEntry[] classpath = safeGetResolvedClasspath(jp);
 
 				// add class path entries
 				for (int i = 0; i < classpath.length; i++) {
@@ -170,7 +172,27 @@ else if (path.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
 		catch (Exception e) {
 			// ignore
 		}
-	}
+	}
+	
+	/**
+	 * Gets the resolved classpath in a safe manner by first grabbing the build rule
+	 * to prevent deadlock.
+	 * @param jp 
+	 * @return resolved classpath of the project
+	 */
+    protected static IClasspathEntry[] safeGetResolvedClasspath(final IJavaProject jp) {
+    	final IClasspathEntry[][] cp = new IClasspathEntry[1][];
+    	try {
+            ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+                public void run(IProgressMonitor monitor) throws CoreException {
+                    cp[0] = jp.getResolvedClasspath(true);
+                }
+            }, ResourcesPlugin.getWorkspace().getRuleFactory().buildRule(), IWorkspace.AVOID_UPDATE, null);
+        } catch (CoreException e) {
+			SpringCore.log(e);
+        }
+        return cp[0];
+    }
 
 	private static void addUri(List<URL> paths, URI uri) throws MalformedURLException {
 		File file = new File(uri);