[jboss-cvs] JBossAS SVN: r80253 - trunk/server/src/main/org/jboss/tm/usertx/client.

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

Author: dimitris at jboss.org
Date: 2008-10-30 10:56:18 -0400 (Thu, 30 Oct 2008)
New Revision: 80253

Modified:
   trunk/server/src/main/org/jboss/tm/usertx/client/ClientUserTransactionObjectFactory.java
Log:
partly revert r80237 (leave the jboss-integration upgrade in).

Modified: trunk/server/src/main/org/jboss/tm/usertx/client/ClientUserTransactionObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/tm/usertx/client/ClientUserTransactionObjectFactory.java	2008-10-30 14:51:57 UTC (rev 80252)
+++ trunk/server/src/main/org/jboss/tm/usertx/client/ClientUserTransactionObjectFactory.java	2008-10-30 14:56:18 UTC (rev 80253)
@@ -57,18 +57,23 @@
     */
    static private UserTransaction getUserTransaction()
    {
-      UserTransaction userTransaction = null;
-      ServerVMClientUserTransaction serverUserTransaction = ServerVMClientUserTransaction.getSingleton();
-      if (serverUserTransaction.isServer())
-      {
-         userTransaction = serverUserTransaction;
+      if (userTransaction == null) {
+         // See if we have a local TM
+         try {
+            new InitialContext().lookup("java:/TransactionManager");
+
+            // We execute in the server.
+            userTransaction = ServerVMClientUserTransaction.getSingleton();
+         } catch (NamingException ex) {
+            // We execute in a stand-alone client.
+            ClientUserTransaction cut = ClientUserTransaction.getSingleton();
+
+            // Tell the proxy that this is the factory for
+            // transaction propagation contexts.
+            TransactionPropagationContextUtil.setTPCFactory(cut);
+            userTransaction = cut;
+         }
       }
-      else
-      {
-         ClientUserTransaction cut = ClientUserTransaction.getSingleton();
-         TransactionPropagationContextUtil.setTPCFactory(cut);
-         userTransaction = cut;
-      }
       return userTransaction;
    }