Author: markt
Date: Sun Jan 6 14:18:38 2008
New Revision: 609439
URL: http://svn.apache.org/viewvc?rev=609439&view=rev
Log:
Fix bug 44041 - duplicate class definition error.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=609439&r1=609438&r2=609439&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Sun Jan 6 14:18:38 2008
@@ -108,7 +108,6 @@
extends URLClassLoader
implements Reloader, Lifecycle
{
-
protected static org.apache.commons.logging.Log log=
org.apache.commons.logging.LogFactory.getLog( WebappClassLoader.class
);
@@ -887,7 +886,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/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609439&r1=609438&r2=609439&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 6 14:18:38 2008
@@ -97,6 +97,10 @@
<bug>43957</bug>: Service.bat didn't configure logging correctly.
Patch provided by Richard Fearn. (markt)
</fix>
+ <fix>
+ <bug>44041</bug>: Fix duplicate class definition error under load.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper" >
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609439&r1=609438&r2=609439&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 6 14:18:38 2008
@@ -47,12 +47,6 @@
-1:
0: fhanik, this needs to be reworked completely, so I'm neutral
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44041
- http://svn.apache.org/viewvc?rev=603340&view=rev
- +1: markt, pero, rjung
- -1:
- rjung: 603340 needs 603074 to.
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44094
Add note about side-effects of setting privileged on a context
http://svn.apache.org/viewvc?rev=605339&view=rev
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
