Author: rmannibucau
Date: Mon Nov 26 23:16:18 2012
New Revision: 1413926
URL: http://svn.apache.org/viewvc?rev=1413926&view=rev
Log:
this hack was a bit ugly and breaks reloading in some IDE...moreover it is not
more useful so remove it
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1413926&r1=1413925&r2=1413926&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
Mon Nov 26 23:16:18 2012
@@ -61,7 +61,6 @@ public class OpenEJBContextConfig extend
private static final String ADJUST_DATASOURCE_JNDI_NAMES =
SystemInstance.get().getProperty("tomee.resources.adjust-web-xml-jndi-name",
"true");
private TomcatWebAppBuilder.StandardContextInfo info;
- private boolean configureStartOk = false;
// processAnnotationXXX is called for each folder of WEB-INF
// since we store all classes in WEB-INF we will do it only once so use
this boolean to avoid multiple processing
@@ -74,14 +73,8 @@ public class OpenEJBContextConfig extend
@Override
public void configureStart() {
- if (configureStartOk) {
- return;
- }
super.configureStart();
-
adjustDataSourceNameIfNecessary(); // doing it here to potentially
factorize resource id resolution
-
- configureStartOk = true;
}
@Override