You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/11/23 10:34:24 UTC

tomee git commit: TOMEE-1454 workaround for 8.2.1.5 of JPA 2.0 spec (avoid setTxType = JTA)

Repository: tomee
Updated Branches:
  refs/heads/develop a8ab062c6 -> 39eef5dea


TOMEE-1454 workaround for 8.2.1.5 of JPA 2.0 spec (avoid setTxType = JTA)


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/39eef5de
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/39eef5de
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/39eef5de

Branch: refs/heads/develop
Commit: 39eef5dea08c8817b7ccb025fe9b0d716f546abe
Parents: a8ab062
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Nov 23 10:33:47 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Nov 23 10:33:47 2014 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/openejb/config/AutoConfig.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/39eef5de/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index 33064f0..42b932e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -1292,7 +1292,8 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
                 logger.info("Configuring PersistenceUnit(name=" + unit.getName() + ")");
             }
 
-            if (unit.getJtaDataSource() == null && unit.getNonJtaDataSource() == null) {
+            if (unit.getJtaDataSource() == null && unit.getNonJtaDataSource() == null
+                    && "true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.force-unit-type", unit.getProperty("openejb.force-unit-type", "false")))) {
                 unit.setTransactionType(TransactionType.JTA); // 8.2.1.5 of JPA 2.0 spec
             }