Index: WebappClassLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.47
diff -u -r1.47 WebappClassLoader.java
--- WebappClassLoader.java	21 Mar 2005 15:59:26 -0000	1.47
+++ WebappClassLoader.java	29 Mar 2005 14:56:46 -0000
@@ -1569,14 +1569,18 @@
 
         entry = findResourceInternal(name, classPath);
 
-        if ((entry == null) || (entry.binaryContent == null
-                && entry.loadedClass == null))
+        if (entry == null)
             throw new ClassNotFoundException(name);
 
         Class clazz = entry.loadedClass;
         if (clazz != null)
             return clazz;
 
+        synchronized (this) {
+            if (entry.binaryContent == null && entry.loadedClass == null)
+                throw new ClassNotFoundException(name);
+        }
+
         // Looking up the package
         String packageName = null;
         int pos = name.lastIndexOf('.');