Fix NPEs on shutdown. Loop is prevented above when the child is removed.

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

diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java
index 14d9206..a2e6200 100644 (file)
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -959,8 +959,6 @@ public abstract class ContainerBase extends LifecycleMBeanBase
         
         fireContainerEvent(REMOVE_CHILD_EVENT, child);
         
-        // Set child's parent to null to prevent a loop
-        child.setParent(null);
         try {
             // child.destroy() may have already been called which would have
             // triggered this call. If that is the case, no need to destroy the