Author: jlmonteiro
Date: Fri May 23 15:32:29 2014
New Revision: 1597117
URL: http://svn.apache.org/r1597117
Log:
TOMEE-1221 Unused code segment on tomee-catalina TomcatWebAppBuilder.java.
Thanks Chamil Jeewantha for the patch
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=1597117&r1=1597116&r2=1597117&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
Fri May 23 15:32:29 2014
@@ -834,15 +834,6 @@ public class TomcatWebAppBuilder impleme
standardContext.setManager(new StandardManager());
}
- if (standardContext.getConfigFile() == null) {
- final String s = File.pathSeparator;
- final File contextXmlFile = new File(standardContext.getDocBase()
+ s + "META-INF" + s + "context.xml");
- if (contextXmlFile.exists()) {
- BackportUtil.getAPI().setConfigFile(standardContext,
contextXmlFile);
- standardContext.setOverride(true);
- }
- }
-
final LifecycleListener[] listeners =
standardContext.findLifecycleListeners();
for (final LifecycleListener l : listeners) {
if (l instanceof ContextConfig) {
