tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1645011 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
Date Fri, 12 Dec 2014 18:12:39 GMT
Author: markt
Date: Fri Dec 12 18:12:39 2014
New Revision: 1645011

URL: http://svn.apache.org/r1645011
Log:
Whoops. Null check.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1645011&r1=1645010&r2=1645011&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Dec 12 18:12:39
2014
@@ -258,7 +258,7 @@ public class ApplicationContext
             child = (Context) host.findChild(uri);
 
             // Non-running contexts should be ignored.
-            if (!child.getState().isAvailable()) {
+            if (child != null && !child.getState().isAvailable()) {
                 child = null;
             }
 



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


Mime
View raw message