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

[rmannibucau]

Author: rmannibucau
Date: Wed Jun 25 21:54:56 2014
New Revision: 1605615

URL: http://svn.apache.org/r1605615
Log:
don't set EmptyDirContext twice since then reload doesnt work

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=1605615&r1=1605614&r2=1605615&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 25 21:54:56 2014
@@ -1035,9 +1035,11 @@ public class TomcatWebAppBuilder impleme
 
         // can only be done until here (before_start)
         if 
(Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.skip-war-resources",
 "false"))) {
-            final EmptyDirContext resources = new 
EmptyDirContext(standardContext);
-            standardContext.setResources(resources);
-            standardContext.setCachingAllowed(resources.isCached());
+            if 
(!EmptyDirContext.class.isInstance(Reflections.get(standardContext, 
"webappResources"))) {
+                final EmptyDirContext resources = new 
EmptyDirContext(standardContext);
+                standardContext.setResources(resources);
+                standardContext.setCachingAllowed(resources.isCached());
+            } // else don't redo it otherwise it just doesn't work when 
reload() is called
         }
     }