[Jboss-cvs] JBossAS SVN: r57024 - trunk/transaction/src/main/org/jboss/tm/remoting/server

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

Author: bdecoste
Date: 2006-09-20 15:45:52 -0400 (Wed, 20 Sep 2006)
New Revision: 57024

Modified:
   trunk/transaction/src/main/org/jboss/tm/remoting/server/DistributedTransactionManager.java
Log:
removed hardcoded TxManager - using javax.transaction.TransactionManager

Modified: trunk/transaction/src/main/org/jboss/tm/remoting/server/DistributedTransactionManager.java
===================================================================
--- trunk/transaction/src/main/org/jboss/tm/remoting/server/DistributedTransactionManager.java	2006-09-20 19:05:20 UTC (rev 57023)
+++ trunk/transaction/src/main/org/jboss/tm/remoting/server/DistributedTransactionManager.java	2006-09-20 19:45:52 UTC (rev 57024)
@@ -29,6 +29,8 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
+import javax.transaction.TransactionManager;
+
 import org.jboss.remoting.InvokerLocator;
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.tm.TxManager;
@@ -104,13 +106,18 @@
       locatorURIs = (String[]) locatorURIList.toArray(new String[0]);
       
       // Set the TxManager's DTM CordinatorFactory and ResourceFactory. 
-      TxManager tm = (TxManager)TMUtil.getTransactionManager();
-      tm.setDTMEnabled(true);
-      tm.setDTMCoordinatorFactory(dtmServant);
-      tm.setDTMResourceFactory(dtmServant);
-      tm.setDTMStringRemoteRefConverter(dtmServant);
-      tm.setInterpositionEnabled(interpositionEnabled);
+      TransactionManager tm = TMUtil.getTransactionManager();
       
+      if (tm instanceof TxManager)
+      {
+         TxManager txManager = (TxManager)tm;
+         txManager.setDTMEnabled(true);
+         txManager.setDTMCoordinatorFactory(dtmServant);
+         txManager.setDTMResourceFactory(dtmServant);
+         txManager.setDTMStringRemoteRefConverter(dtmServant);
+         txManager.setInterpositionEnabled(interpositionEnabled);
+      }
+      
       // Bind the DTM TransactionFactory proxy into JNDI 
       Context ctx = new InitialContext();
       TransactionFactory transactionFactory =