From afb62fbebcef1b0fed378ce2515485df1cd6d771 Mon Sep 17 00:00:00 2001 From: remm Date: Tue, 1 Aug 2006 11:57:41 +0000 Subject: [PATCH] - 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 --- java/org/apache/catalina/core/StandardContext.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index e99ccbffb..839e00229 100644 --- 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(); -- 2.11.0