Author: rmannibucau
Date: Wed Mar 20 15:27:11 2013
New Revision: 1458885
URL: http://svn.apache.org/r1458885
Log:
tomcat-only should work globally too
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=1458885&r1=1458884&r2=1458885&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 Mar 20 15:27:11 2013
@@ -1577,7 +1577,9 @@ public class TomcatWebAppBuilder impleme
if (name.startsWith("/")) {
name = name.substring(1);
}
- return "true".equalsIgnoreCase(SystemInstance.get().getProperty(name +
".tomcat-only", "false"));
+
+ final SystemInstance systemInstance = SystemInstance.get();
+ return "true".equalsIgnoreCase(systemInstance.getProperty(name +
".tomcat-only", systemInstance.getProperty("tomcat-only", "false")));
}
/**
