Author: rmannibucau Date: Fri Sep 20 07:47:37 2013 New Revision: 1524926 URL: http://svn.apache.org/r1524926 Log: TOMEE-1038 avoid ambiguity and then not deterministic auto resource creation
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1524926&r1=1524925&r2=1524926&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Fri Sep 20 07:47:37 2013 @@ -1611,6 +1611,7 @@ public class AutoConfig implements Dynam final Properties overrides = ConfigurationFactory.getSystemProperties(nonJtaResourceInfo.id, nonJtaResourceInfo.service); nonJtaResourceInfo.properties.putAll(overrides); nonJtaResourceInfo.properties.setProperty("JtaManaged", "false"); + nonJtaResourceInfo.properties.remove("Definition"); // if created from annotation we just want live config logAutoCreateResource(nonJtaResourceInfo, "DataSource", unit.getName()); logger.info("configureService.configuring", nonJtaResourceInfo.id, nonJtaResourceInfo.service, jtaResourceInfo.id); @@ -1671,6 +1672,7 @@ public class AutoConfig implements Dynam final Properties overrides = ConfigurationFactory.getSystemProperties(jtaResourceInfo.id, jtaResourceInfo.service); jtaResourceInfo.properties.putAll(overrides); jtaResourceInfo.properties.setProperty("JtaManaged", "true"); + jtaResourceInfo.properties.remove("Definition"); // if created from annotation we just want live config logAutoCreateResource(jtaResourceInfo, "DataSource", unit.getName()); logger.info("configureService.configuring", jtaResourceInfo.id, jtaResourceInfo.service, nonJtaResourceInfo.id);