From 5aa18bc8000494d01710bc40deba8d187a8950e3 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 17 Feb 2011 13:10:36 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/core/ContainerBase.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java index 14d920675..a2e6200fc 100644 --- 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 -- 2.11.0