Author: markt
Date: Tue May 11 13:09:43 2010
New Revision: 943112

URL: http://svn.apache.org/viewvc?rev=943112&view=rev
Log:
NPE protection

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=943112&r1=943111&r2=943112&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Tue May 11 
13:09:43 2010
@@ -899,6 +899,10 @@ public abstract class ContainerBase exte
      */
     public void removeChild(Container child) {
 
+        if (child == null) {
+            return;
+        }
+        
         synchronized(children) {
             if (children.get(child.getName()) == null)
                 return;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to