[jboss-cvs] JBossAS SVN: r112713 - projects/jpa/branches/jboss-jpa-deployers-1.0.0.SP/src/main/java/org/jboss/jpa/tx.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2012-02-29 04:23:26 -0500 (Wed, 29 Feb 2012)
New Revision: 112713

Modified:
   projects/jpa/branches/jboss-jpa-deployers-1.0.0.SP/src/main/java/org/jboss/jpa/tx/TransactionScopedEntityManager.java
Log:
JBPAPP-923: only look at XPC propagation if there is a tx


Modified: projects/jpa/branches/jboss-jpa-deployers-1.0.0.SP/src/main/java/org/jboss/jpa/tx/TransactionScopedEntityManager.java
===================================================================
--- projects/jpa/branches/jboss-jpa-deployers-1.0.0.SP/src/main/java/org/jboss/jpa/tx/TransactionScopedEntityManager.java	2012-02-29 05:22:40 UTC (rev 112712)
+++ projects/jpa/branches/jboss-jpa-deployers-1.0.0.SP/src/main/java/org/jboss/jpa/tx/TransactionScopedEntityManager.java	2012-02-29 09:23:26 UTC (rev 112713)
@@ -248,12 +248,15 @@
          }
       }
       */
-      String kernelName = factory.getKernelName();
-      PersistenceUnit pu = PersistenceUnitRegistry.getPersistenceUnit(kernelName);
-      XPCResolver xpcResolver = pu.getXPCResolver();
-      EntityManager em = xpcResolver.getExtendedPersistenceContext(kernelName);
-      if(em != null)
-         return em;
+      if (factory.isInTx() || Boolean.getBoolean("JBPAPP-923.alwaysPropagate"))
+      {
+         String kernelName = factory.getKernelName();
+         PersistenceUnit pu = PersistenceUnitRegistry.getPersistenceUnit(kernelName);
+         XPCResolver xpcResolver = pu.getXPCResolver();
+         EntityManager em = xpcResolver.getExtendedPersistenceContext(kernelName);
+         if(em != null)
+            return em;
+      }
       
       return factory.getTransactionScopedEntityManager();
    }