[seam-commits] Seam SVN: r14984 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-07-17 16:37:02 -0400 (Tue, 17 Jul 2012)
New Revision: 14984

Modified:
   branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction/Transaction.java
Log:
JBPAPP-8322 added lookup for AS7 JNDI UserTransaction

Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction/Transaction.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction/Transaction.java	2012-07-17 19:33:12 UTC (rev 14983)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/transaction/Transaction.java	2012-07-17 20:37:02 UTC (rev 14984)
@@ -85,6 +85,17 @@
       {
          try
          {
+            // JBPAPP-8322
+            return (UserTransaction) context.lookup("java:jboss/UserTransaction");
+         }
+         catch (final Exception cause)
+         {
+            // ignore this so we let the code carry on to try the final JNDI
+            // name
+         }
+         
+         try
+         {
             //Embedded JBoss has no java:comp/UserTransaction
             javax.transaction.UserTransaction ut = (javax.transaction.UserTransaction) context.lookup("UserTransaction");
             ut.getStatus(); //for glassfish, which can return an unusable UT