You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/06/01 17:28:56 UTC

svn commit: r1345238 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Author: rmannibucau
Date: Fri Jun  1 15:28:56 2012
New Revision: 1345238

URL: http://svn.apache.org/viewvc?rev=1345238&view=rev
Log:
managing beforeStop to call preDestroy from the assembler, it currently close all entitymanagers because some providers needs to do it before the classloaders are stopped

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

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1345238&r1=1345237&r2=1345238&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Fri Jun  1 15:28:56 2012
@@ -52,6 +52,7 @@ import org.apache.openejb.AppContext;
 import org.apache.openejb.BeanContext;
 import org.apache.openejb.Injection;
 import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.UndeployException;
 import org.apache.openejb.assembler.classic.*;
 import org.apache.openejb.cdi.CdiBuilder;
 import org.apache.openejb.config.AppModule;
@@ -632,7 +633,7 @@ public class TomcatWebAppBuilder impleme
      */
 //    @Override
     private void startInternal(final StandardContext standardContext) {
-        System.out.println("TomcatWebAppBuilder.start " + standardContext.getPath());
+        logger.info("TomcatWebAppBuilder.start " + standardContext.getPath());
         if (isIgnored(standardContext)) return;
 
         final CoreContainerSystem cs = getContainerSystem();
@@ -969,7 +970,7 @@ public class TomcatWebAppBuilder impleme
                     pipeline.addValve(valve);
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                logger.error("can't add the valve " + className, e);
             }
         }
 
@@ -1051,7 +1052,19 @@ public class TomcatWebAppBuilder impleme
      */
     @Override
     public void beforeStop(final StandardContext standardContext) {
-        //No operation
+        final ContextInfo contextInfo = getContextInfo(standardContext);
+        if (isUnDeployable(contextInfo)) {
+            try {
+                assembler.preDestroyApplication(contextInfo.appInfo, null);
+            } catch (UndeployException e) {
+                logger.error("can't pre deploy the app " + standardContext.getName(), e);
+            }
+        }
+    }
+
+    private boolean isUnDeployable(final ContextInfo contextInfo) {
+        return contextInfo != null && contextInfo.appInfo != null && contextInfo.deployer == null
+                && getAssembler().getDeployedApplications().contains(contextInfo.appInfo);
     }
 
     /**
@@ -1070,8 +1083,7 @@ public class TomcatWebAppBuilder impleme
         if (isIgnored(standardContext)) return;
 
         final ContextInfo contextInfo = getContextInfo(standardContext);
-        if (contextInfo != null && contextInfo.appInfo != null && contextInfo.deployer == null
-                && getAssembler().getDeployedApplications().contains(contextInfo.appInfo)) {
+        if (isUnDeployable(contextInfo)) {
             try {
                 getAssembler().destroyApplication(contextInfo.appInfo.path);
             } catch (Exception e) {