Author: markt
Date: Fri Sep  1 04:31:11 2006
New Revision: 439273

URL: http://svn.apache.org/viewvc?rev=439273&view=rev
Log:
Fix bug 39704. Note that this bug was a side effect of fixing 
http://jira.jboss.com/jira/browse/JBAS-1688
The fix should not introduce a regression since it only sets the parent 
classloader on context creation (and not on context configuration). JBAS-1688 
occured when the parent classloader was set on context configuration.

Modified:
    
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java?rev=439273&r1=439272&r2=439273&view=diff
==============================================================================
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
 Fri Sep  1 04:31:11 2006
@@ -126,6 +126,8 @@
 
         if (create) {
             digester.addRule(prefix + "Context",
+                    new CopyParentClassLoaderRule());
+            digester.addRule(prefix + "Context",
                              new LifecycleListenerRule
                                  ("org.apache.catalina.startup.ContextConfig",
                                   "configClass"));

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=439273&r1=439272&r2=439273&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Sep  1 04:31:11 2006
@@ -14,6 +14,33 @@
 
 <body>
 
+<section name="Tomcat 5.5.19">
+  <subsection name="General">
+    <changelog>
+      <fix>
+        <bug>39704</bug>: The use of custom classloaders failed when the 
context
+        was specified in server.xml (markt)
+      </fix>
+    </changelog>
+  </subsection>
+  <subsection name="Catalina">
+    <changelog>
+  </changelog>
+  </subsection> 
+  <subsection name="Coyote">
+    <changelog>
+  </changelog>
+  </subsection> 
+  <subsection name="Webapps">
+    <changelog>
+    </changelog>
+  </subsection> 
+  <subsection name="Cluster">
+    <changelog>
+    </changelog>
+  </subsection>   
+</section>
+
 <section name="Tomcat 5.5.18 (yoavs)">
   <subsection name="General">
     <changelog>



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

Reply via email to