Better patch based on Filip's comments

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@603340 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 1b7b703..0b313a4 100644 (file)
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -167,12 +167,6 @@ public class WebappClassLoader
      */
     boolean antiJARLocking = false; 
     
-    /**
-     * Lock to prevent attempts to load duplicate classes from external
-     * repositories.
-     */
-    private Object lock = new Object();
-
     // ----------------------------------------------------------- Constructors
 
 
@@ -888,7 +882,7 @@ public class WebappClassLoader
             }
             if ((clazz == null) && hasExternalRepositories) {
                 try {
-                    synchronized (lock) {
+                    synchronized (this) {
                         clazz = super.findClass(name);
                     }
                 } catch(AccessControlException ace) {