- Stop wrappers a bit earlier.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@427546 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index e99ccbf..839e002 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4445,6 +4445,13 @@ public class StandardContext
             // 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();
 
@@ -4470,13 +4477,6 @@ public class StandardContext
                 ((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
             if (context != null)
                 context.clearAttributes();