Author: markt
Date: Mon Dec 17 11:36:44 2007
New Revision: 604974

URL: http://svn.apache.org/viewvc?rev=604974&view=rev
Log:
Fix bug 44041. Duplicate class definition under load.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=604974&r1=604973&r2=604974&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 17 11:36:44 2007
@@ -31,11 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match 
the dir structure
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
-  http://svn.apache.org/viewvc?rev=603340&view=rev
-  +1: markt, jim, fhanik
-  -1:
-
 * Fix chunked encoding parsing
   The following patch fixes how the Comet processors blocks, it doesn't change 
the 
   way chunked parsing is done, but changing when it blocks and doesn't block.

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=604974&r1=604973&r2=604974&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
Mon Dec 17 11:36:44 2007
@@ -883,7 +883,9 @@
             }
             if ((clazz == null) && hasExternalRepositories) {
                 try {
-                    clazz = super.findClass(name);
+                    synchronized (this) {
+                        clazz = super.findClass(name);
+                    }
                 } catch(AccessControlException ace) {
                     throw new ClassNotFoundException(name, ace);
                 } catch (RuntimeException e) {

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=604974&r1=604973&r2=604974&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Dec 17 11:36:44 2007
@@ -95,6 +95,9 @@
       <fix>
         <bug>43993</bug>: mime mapping for WS-Policy. Patch by Fabian Ritzmann 
 (funkman)
       </fix>
+      <fix>
+        <bug>44041</bug>: Fix duplicate class definition under load. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to