svn commit: r1397946 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java

[rm...@apache.org]

Author: rmannibucau
Date: Sat Oct 13 20:51:03 2012
New Revision: 1397946

URL: http://svn.apache.org/viewvc?rev=1397946&view=rev
Log:
TOMEE-464 calling stop on webappclassloader after destroyapplication - adding config tomee.webappclassloader.force-stop-phase for case which need hack

Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1397946&r1=1397945&r2=1397946&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java Sat Oct 13 20:51:03 2012
@@ -33,6 +33,7 @@ public class LazyStopWebappClassLoader e
 
     private boolean restarting = false;
     private volatile Context relatedContext;
+    private boolean forceStopPhase = Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.webappclassloader.force-stop-phase", "false"));
 
     public LazyStopWebappClassLoader() {
         setDelegate(isDelegate());
@@ -45,8 +46,7 @@ public class LazyStopWebappClassLoader e
     @Override
     public void stop() throws LifecycleException {
         // in our destroyapplication method we need a valid classloader to TomcatWebAppBuilder.afterStop()
-        // exception: restarting we really stop it for the moment
-        if (restarting || TomcatContextUtil.isReloading(relatedContext)) {
+        if (forceStopPhase && (restarting || TomcatContextUtil.isReloading(relatedContext))) {
             internalStop();
         }
     }