- Experiment with stopping the manager a bit earlier.

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

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 9c6277d..4c77d82 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4483,9 +4483,6 @@ public class StandardContext
             // Stop our filters
             filterStop();
 
-            // Stop our application listeners
-            listenerStop();
-
             // Stop ContainerBackgroundProcessor thread
             super.threadStop();
 
@@ -4493,6 +4490,9 @@ public class StandardContext
                 ((Lifecycle) manager).stop();
             }
 
+            // Stop our application listeners
+            listenerStop();
+
             // Finalize our character set mapper
             setCharsetMapper(null);