Author: markt
Date: Sun Mar 3 15:17:11 2013
New Revision: 1452053
URL: http://svn.apache.org/r1452053
Log:
Structure 101. Reduce a circular package dependency.
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=1452053&r1=1452052&r2=1452053&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Sun Mar 3
15:17:11 2013
@@ -52,13 +52,13 @@ import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
+import org.apache.catalina.Loader;
import org.apache.catalina.Pipeline;
import org.apache.catalina.Realm;
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;
@@ -1343,15 +1343,17 @@ public abstract class ContainerBase exte
try {
if (container instanceof Context) {
- if (container instanceof FailedContext) {
+ Loader loader = ((Context) container).getLoader();
+ // Loader will be null for FailedContext instances
+ if (loader == null) {
return;
}
// Ensure background processing for Contexts and Wrappers
// is performed under the web app's class loader
originalClassLoader =
Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader
- (((Context)
container).getLoader().getClassLoader());
+ Thread.currentThread().setContextClassLoader(
+ loader.getClassLoader());
}
container.backgroundProcess();
Container[] children = container.findChildren();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
