[jboss-cvs] JBossAS SVN: r108720 - projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager.

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

Author: jesper.pedersen
Date: 2010-10-21 13:44:35 -0400 (Thu, 21 Oct 2010)
New Revision: 108720

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java
Log:
[JBJCA-449] Register transaction manager against TransactionSynchronizer

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java	2010-10-21 17:34:58 UTC (rev 108719)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ConnectionManagerFactory.java	2010-10-21 17:44:35 UTC (rev 108720)
@@ -25,6 +25,7 @@
 import org.jboss.jca.core.connectionmanager.ccm.CachedConnectionManager;
 import org.jboss.jca.core.connectionmanager.notx.NoTxConnectionManagerImpl;
 import org.jboss.jca.core.connectionmanager.pool.api.Pool;
+import org.jboss.jca.core.connectionmanager.transaction.TransactionSynchronizer;
 import org.jboss.jca.core.connectionmanager.tx.TxConnectionManagerImpl;
 
 import javax.resource.spi.TransactionSupport.TransactionSupportLevel;
@@ -141,6 +142,7 @@
 
       setProperties(cm, pool, allocationRetry, allocationRetryWaitMillis, tm);
       setTxProperties(cm, interleaving, xaResourceTimeout, isSameRMOverride, wrapXAResource, padXid);
+      handleTxIntegration(tm);
 
       return cm;
    }
@@ -211,4 +213,15 @@
       if (padXid != null)
          cm.setPadXid(padXid.booleanValue());
    }
+   
+   /**
+    * Associate the transaction synchronizer with the transaction
+    * manager.
+    * 
+    * @param tm TransactionManager
+    */
+   public void handleTxIntegration(final TransactionManager tm)
+   {
+      TransactionSynchronizer.setTransactionManager(tm);
+   }
 }