STS-2472: reduced the lock size when creating project classloaders

tobias-hammerschmidt · Mar 2, 2012 · d3c3a39 · d3c3a39
1 parent 58fbd02
commit d3c3a39
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/...e.eclipse.core/src/org/springframework/ide/eclipse/core/java/ProjectClassLoaderCache.java b/...e.eclipse.core/src/org/springframework/ide/eclipse/core/java/ProjectClassLoaderCache.java
@@ -300,29 +300,31 @@ private static boolean useNonLockingClassLoader() {
 	 * Returns a {@link ClassLoader} for the given project.
 	 */
 	@SuppressWarnings({ "unchecked" })
-	protected synchronized static ClassLoader getClassLoader(IProject project, ClassLoader parentClassLoader) {
-		// Setup the root class loader to be used when no explicit parent class loader is given
-		if (parentClassLoader == null && cachedParentClassLoader == null) {
-			List<URL> paths = new ArrayList<URL>();
-			Enumeration<String> libs = SpringCore.getDefault().getBundle().getEntryPaths("/lib/");
-			while (libs.hasMoreElements()) {
-				String lib = libs.nextElement();
-				// Don't add the non locking classloader jar
-				if (!lib.contains("xbean-nonlocking-classloader")) {
-					paths.add(SpringCore.getDefault().getBundle().getEntry(lib));
+	protected static ClassLoader getClassLoader(IProject project, ClassLoader parentClassLoader) {
+		synchronized (ProjectClassLoaderCache.class) {
+			// Setup the root class loader to be used when no explicit parent class loader is given
+			if (parentClassLoader == null && cachedParentClassLoader == null) {
+				List<URL> paths = new ArrayList<URL>();
+				Enumeration<String> libs = SpringCore.getDefault().getBundle().getEntryPaths("/lib/");
+				while (libs.hasMoreElements()) {
+					String lib = libs.nextElement();
+					// Don't add the non locking classloader jar
+					if (!lib.contains("xbean-nonlocking-classloader")) {
+						paths.add(SpringCore.getDefault().getBundle().getEntry(lib));
+					}
 				}
+				paths.addAll(JdtUtils.getBundleClassPath("com.springsource.org.aspectj.weaver"));
+				paths.addAll(JdtUtils.getBundleClassPath("com.springsource.org.objectweb.asm"));
+				paths.addAll(JdtUtils.getBundleClassPath("org.aopalliance"));
+				cachedParentClassLoader = new URLClassLoader(paths.toArray(new URL[paths.size()]));
 			}
-			paths.addAll(JdtUtils.getBundleClassPath("com.springsource.org.aspectj.weaver"));
-			paths.addAll(JdtUtils.getBundleClassPath("com.springsource.org.objectweb.asm"));
-			paths.addAll(JdtUtils.getBundleClassPath("org.aopalliance"));
-			cachedParentClassLoader = new URLClassLoader(paths.toArray(new URL[paths.size()]));
-		}
 
-		if (project == null) {
-			return cachedParentClassLoader;
-		}
+			if (project == null) {
+				return cachedParentClassLoader;
+			}
 
-		registerListenersIfRequired();
+			registerListenersIfRequired();
+		}
 
 		ClassLoader classLoader = findClassLoaderInCache(project, parentClassLoader);
 		if (classLoader == null) {