NPE protection

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

diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java
index b0a61e9..c9d61b8 100644 (file)
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -899,6 +899,10 @@ public abstract class ContainerBase extends LifecycleMBeanBase
      */
     public void removeChild(Container child) {
 
+        if (child == null) {
+            return;
+        }
+        
         synchronized(children) {
             if (children.get(child.getName()) == null)
                 return;