svn commit: r427546 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java

[remm]

Author: remm
Date: Tue Aug  1 04:57:41 2006
New Revision: 427546

URL: http://svn.apache.org/viewvc?rev=427546&view=rev
Log:
- Stop wrappers a bit earlier.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=427546&r1=427545&r2=427546&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue 
Aug  1 04:57:41 2006
@@ -4445,6 +4445,13 @@
             // Stop our filters
             filterStop();
 
+            // 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 application listeners
             listenerStop();
 
@@ -4468,13 +4475,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



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