From b9cfe7414a32dc91afa6b549508cffb63a92abfc Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 11 May 2010 13:09:43 +0000
Subject: [PATCH] NPE protection

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@943112 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/ContainerBase.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java
index b0a61e987..c9d61b81d 100644
--- 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;
-- 
2.11.0