svn commit: r1492146 - in /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina: LazyStopWebappClassLoader.java TomcatContextUtil.java TomcatWebAppBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Wed Jun 12 11:18:27 2013
New Revision: 1492146

URL: http://svn.apache.org/r1492146
Log:
small cleanup, seems we don't need TomcatContextUtil and related context in our 
custom loader for months

Removed:
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatContextUtil.java
Modified:
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1492146&r1=1492145&r2=1492146&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
 Wed Jun 12 11:18:27 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.tomee.catalina;
 
-import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.loader.WebappClassLoader;
 import org.apache.openejb.OpenEJB;
@@ -40,7 +39,6 @@ public class LazyStopWebappClassLoader e
     public static final String TOMEE_WEBAPP_FIRST = "tomee.webapp-first";
 
     private boolean restarting = false;
-    private volatile Context relatedContext;
     private boolean forceStopPhase = 
Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.webappclassloader.force-stop-phase",
 "false"));
     private ClassLoaderConfigurer configurer = null;
 
@@ -61,7 +59,7 @@ public class LazyStopWebappClassLoader e
     @Override
     public void stop() throws LifecycleException {
         // in our destroyapplication method we need a valid classloader to 
TomcatWebAppBuilder.afterStop()
-        if (forceStopPhase && (restarting || 
TomcatContextUtil.isReloading(relatedContext))) {
+        if (forceStopPhase && restarting) {
             internalStop();
         }
     }
@@ -185,10 +183,6 @@ public class LazyStopWebappClassLoader e
         return true;
     }
 
-    public void setRelatedContext(final Context standardContext) {
-        relatedContext = standardContext;
-    }
-
     public static boolean isDelegate() {
         return !SystemInstance.get().getOptions().get(TOMEE_WEBAPP_FIRST, 
true);
     }

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1492146&r1=1492145&r2=1492146&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Wed Jun 12 11:18:27 2013
@@ -1358,7 +1358,7 @@ public class TomcatWebAppBuilder impleme
         final Container child = host.findChild(standardContext.getName());
 
         // skip undeployment if redeploying (StandardContext.redeploy())
-        if (child instanceof org.apache.catalina.Context && 
TomcatContextUtil.isReloading((org.apache.catalina.Context) child)) {
+        if (child instanceof org.apache.catalina.Context && 
org.apache.catalina.Context.class.cast(child).getPaused()) {
             return true;
         }