Author: markt
Date: Thu Feb 17 13:10:36 2011
New Revision: 1071601
URL: http://svn.apache.org/viewvc?rev=1071601&view=rev
Log:
Fix NPEs on shutdown. Loop is prevented above when the child is removed.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1071601&r1=1071600&r2=1071601&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Thu Feb 17
13:10:36 2011
@@ -959,8 +959,6 @@ public abstract class ContainerBase exte
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
