svn commit: r1620475 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java

[rmannibucau]

Author: rmannibucau
Date: Mon Aug 25 22:01:52 2014
New Revision: 1620475

URL: http://svn.apache.org/r1620475
Log:
TOMEE-1335 OPENEJB_DEPLOYER_SAVE_DEPLOYMENTS should be respected for wars as 
well

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1620475&r1=1620474&r2=1620475&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
 Mon Aug 25 22:01:52 2014
@@ -172,8 +172,10 @@ public class DeployerEjb implements Depl
         if (WebAppDeployer.Helper.isWebApp(file) && !oldWarDeployer) {
             AUTO_DEPLOY.set(autoDeploy);
             try {
-                return SystemInstance.get().getComponent(WebAppDeployer.class)
-                    .deploy(host, contextRoot(properties, 
file.getAbsolutePath()), file);
+                final AppInfo appInfo = 
SystemInstance.get().getComponent(WebAppDeployer.class)
+                        .deploy(host, contextRoot(properties, 
file.getAbsolutePath()), file);
+                saveIfNeeded(properties, file, appInfo);
+                return appInfo;
             } finally {
                 AUTO_DEPLOY.remove();
             }
@@ -240,10 +242,7 @@ public class DeployerEjb implements Depl
 
             assembler.createApplication(appInfo);
 
-            if (SAVE_DEPLOYMENTS || 
"true".equalsIgnoreCase(properties.getProperty(OPENEJB_DEPLOYER_SAVE_DEPLOYMENTS,
 "false"))) {
-                appInfo.properties.setProperty("save-deployment","true");
-                saveDeployment(file, true);
-            }
+            saveIfNeeded(properties, file, appInfo);
 
             return appInfo;
 
@@ -273,6 +272,13 @@ public class DeployerEjb implements Depl
         }
     }
 
+    private void saveIfNeeded(Properties properties, File file, AppInfo 
appInfo) {
+        if (SAVE_DEPLOYMENTS || 
"true".equalsIgnoreCase(properties.getProperty(OPENEJB_DEPLOYER_SAVE_DEPLOYMENTS,
 "false"))) {
+            appInfo.properties.setProperty("save-deployment","true");
+            saveDeployment(file, true);
+        }
+    }
+
     private static File copyBinaries(final Properties props) throws 
OpenEJBException {
         final File dump = 
ProvisioningResolver.cacheFile(props.getProperty(OPENEJB_PATH_BINARIES, 
"dump.war"));
         if (dump.exists()) {