You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/11/02 03:11:20 UTC
svn commit: r1029940 -
/geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ContainerBase.java
Author: xuhaihong
Date: Tue Nov 2 02:11:20 2010
New Revision: 1029940
URL: http://svn.apache.org/viewvc?rev=1029940&view=rev
Log:
GERONIMO-5665 Some more changes
Modified:
geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ContainerBase.java
Modified: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ContainerBase.java?rev=1029940&r1=1029939&r2=1029940&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ContainerBase.java (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/core/ContainerBase.java Tue Nov 2 02:11:20 2010
@@ -1094,6 +1094,16 @@ public abstract class ContainerBase exte
@Override
protected void destroyInternal() throws LifecycleException {
+ // Stop the Valves in our pipeline (including the basic), if any
+ if (pipeline instanceof Lifecycle) {
+ ((Lifecycle) pipeline).destroy();
+ }
+
+ // Remove children now this container is being destroyed
+ for (Container child : findChildren()) {
+ removeChild(child);
+ }
+
// Required if the child is destroyed directly.
if (parent != null) {
if (parent instanceof ContainerBase) {
@@ -1101,17 +1111,9 @@ public abstract class ContainerBase exte
} else {
parent.removeChild(this);
}
- } else {
- // Stop the Valves in our pipeline (including the basic), if any
- if (pipeline instanceof Lifecycle) {
- ((Lifecycle) pipeline).destroy();
- }
- // Remove children now this container is being destroyed
- for (Container child : findChildren()) {
- removeChild(child);
- }
- super.destroyInternal();
}
+
+ super.destroyInternal();
}