tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1408162 - /tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Date Mon, 12 Nov 2012 00:43:05 GMT
Author: markt
Date: Mon Nov 12 00:43:04 2012
New Revision: 1408162

URL: http://svn.apache.org/viewvc?rev=1408162&view=rev
Log:
Prevent NPEs with background processing and a failed deployment.

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=1408162&r1=1408161&r2=1408162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Mon Nov 12 00:43:04 2012
@@ -58,6 +58,7 @@ import org.apache.catalina.Valve;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
+import org.apache.catalina.startup.FailedContext;
 import org.apache.catalina.util.ContextName;
 import org.apache.catalina.util.LifecycleMBeanBase;
 import org.apache.juli.logging.Log;
@@ -1342,6 +1343,9 @@ public abstract class ContainerBase exte
 
             try {
                 if (container instanceof Context) {
+                    if (container instanceof FailedContext) {
+                        return;
+                    }
                     // Ensure background processing for Contexts and Wrappers
                     // is performed under the web app's class loader
                     originalClassLoader =



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


Mime
View raw message