synchronized class loading properly - fixes #2108

[skip ci]
jruby · Nov 7, 2014 · ac9f2eb · ac9f2eb
1 parent 5d93cdc
commit ac9f2eb
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/util/JRubyClassLoader.java b/core/src/main/java/org/jruby/util/JRubyClassLoader.java
@@ -136,15 +136,17 @@ public void addURL(URL url) {
 
     @Override
     public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-        Class<?> c = findLoadedClass(name);
-        if (c == null) {
-            try {
-                c = findClass(name);
-            } catch (ClassNotFoundException e) {
-                return super.loadClass(name, resolve);
+        synchronized (getClassLoadingLock(name)) {
+            Class<?> c = findLoadedClass(name);
+            if (c == null) {
+                try {
+                    c = findClass(name);
+                } catch (ClassNotFoundException e) {
+                    return super.loadClass(name, resolve);
+                }
             }
+            return c;
         }
-        return c;
     }
 
     /**