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

[rmannibucau]

Author: rmannibucau
Date: Sun Mar  2 10:09:29 2014
New Revision: 1573276

URL: http://svn.apache.org/r1573276
Log:
TOMEE-1136 first step to keep context.stop() working, still some testing to 
validate

Modified:
    
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/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1573276&r1=1573275&r2=1573276&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
 Sun Mar  2 10:09:29 2014
@@ -718,12 +718,14 @@ public class TomcatWebAppBuilder impleme
             if (contextInfo != null) {
                 final StandardContext standardContext = 
contextInfo.standardContext;
 
-                undeploy(standardContext, contextInfo);
-                final File extracted = Contexts.warPath(standardContext);
-                if (isExtracted(extracted)) {
-                    deleteDir(extracted);
+                if (!appInfo.webAppAlone || 
!appInfo.properties.containsKey("tomee.destroying")) {
+                    undeploy(standardContext, contextInfo);
+                    final File extracted = Contexts.warPath(standardContext);
+                    if (isExtracted(extracted)) {
+                        deleteDir(extracted);
+                    }
+                    removeContextInfo(standardContext);
                 }
-                removeContextInfo(standardContext);
             }
         }
     }