Author: markt
Date: Wed Sep 6 19:10:10 2006
New Revision: 440946
URL: http://svn.apache.org/viewvc?view=rev&rev=440946
Log:
Rre-fix 30762 which was a spec-compliance issue.
Successfully tested with Yoav's test war from the bug report.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?view=diff&rev=440946&r1=440945&r2=440946
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
Wed Sep 6 19:10:10 2006
@@ -4338,6 +4338,12 @@
ClassLoader oldCCL = bindThread();
try {
+ // Stop our child containers, if any
+ Container[] children = findChildren();
+ for (int i = 0; i < children.length; i++) {
+ if (children[i] instanceof Lifecycle)
+ ((Lifecycle) children[i]).stop();
+ }
// Stop our filters
filterStop();
@@ -4365,13 +4371,6 @@
// Stop the Valves in our pipeline (including the basic), if any
if (pipeline instanceof Lifecycle) {
((Lifecycle) pipeline).stop();
- }
-
- // Stop our child containers, if any
- Container[] children = findChildren();
- for (int i = 0; i < children.length; i++) {
- if (children[i] instanceof Lifecycle)
- ((Lifecycle) children[i]).stop();
}
// Clear all application-originated servlet context attributes
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?view=diff&rev=440946&r1=440945&r2=440946
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Sep 6 19:10:10 2006
@@ -24,12 +24,16 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>30762</bug>: Re-fix this bug that was re-introduced by the fix
+ to <bug>37264</bug>. (markt)
+ </fix>
+ <fix>
<bug>37588</bug>: Fix JNDI realm creation through JMX. Patch
contributed by TerryZhou (fhanik)
</fix>
<fix>
<bug>39704</bug>: The use of custom classloaders failed when the
context
was specified in server.xml. Correction of the fault will require
setting
- the new loader attribute useSystemClassLoaderAsParent to false.(markt)
+ the new loader attribute useSystemClassLoaderAsParent to false. (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
