[jboss-cvs] JBossAS SVN: r80321 - projects/integration/trunk/jboss-transaction-spi/src/main/java/org/jboss/tm/usertx/client.

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

Author: galder.zamarreno at jboss.com
Date: 2008-10-31 12:10:29 -0400 (Fri, 31 Oct 2008)
New Revision: 80321

Modified:
   projects/integration/trunk/jboss-transaction-spi/src/main/java/org/jboss/tm/usertx/client/ServerVMClientUserTransaction.java
Log:
[JBAS-5908] If locateTransactionManager throws a RuntimeException, we need to catch it and assign tm = null.

Modified: projects/integration/trunk/jboss-transaction-spi/src/main/java/org/jboss/tm/usertx/client/ServerVMClientUserTransaction.java
===================================================================
--- projects/integration/trunk/jboss-transaction-spi/src/main/java/org/jboss/tm/usertx/client/ServerVMClientUserTransaction.java	2008-10-31 16:10:13 UTC (rev 80320)
+++ projects/integration/trunk/jboss-transaction-spi/src/main/java/org/jboss/tm/usertx/client/ServerVMClientUserTransaction.java	2008-10-31 16:10:29 UTC (rev 80321)
@@ -84,9 +84,21 @@
     */
    private ServerVMClientUserTransaction()
    {
-      this(TransactionManagerLocator.locateTransactionManager());
+      this(locateTransactionManager());
    }
    
+   private static TransactionManager locateTransactionManager()
+   {
+      try
+      {
+         return TransactionManagerLocator.locateTransactionManager();
+      }
+      catch(RuntimeException re)
+      {
+         return null;
+      }
+   }
+   
    //public constructor for TESTING ONLY
    public ServerVMClientUserTransaction(final TransactionManager tm)
    {