svn commit: r1204263 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java

[rmannibucau]

Author: rmannibucau
Date: Sun Nov 20 21:07:22 2011
New Revision: 1204263

URL: http://svn.apache.org/viewvc?rev=1204263&view=rev
Log:
managing default value for 
AutoConfig.AUTOCREATE_JTA_DATASOURCE_FROM_NON_JTA_ONE_KEY property

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1204263&r1=1204262&r2=1204263&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 Sun Nov 20 21:07:22 2011
@@ -1447,9 +1447,10 @@ public class AutoConfig implements Dynam
             //  and finally setting JtaManaged=false
             //
 
+            final String deduceJtaFromNonJta = 
SystemInstance.get().getProperty(AUTOCREATE_JTA_DATASOURCE_FROM_NON_JTA_ONE_KEY);
             if (nonJtaDataSourceId != null && jtaDataSourceId == null
                     // hibernate uses the fact that this ds is missing to get 
a non jta em instead of a JTA one
-                    && 
Boolean.parseBoolean(SystemInstance.get().getProperty(AUTOCREATE_JTA_DATASOURCE_FROM_NON_JTA_ONE_KEY)))
 {
+                    && (deduceJtaFromNonJta == null || (deduceJtaFromNonJta != 
null && Boolean.parseBoolean(deduceJtaFromNonJta)))) {
 
                 ResourceInfo nonJtaResourceInfo = 
configFactory.getResourceInfo(nonJtaDataSourceId);