[seam-commits] Seam SVN: r14267 - in branches/community/Seam_2_3: jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction and 1 other directory.

Author: manaRH Date: 2012-01-26 11:19:18 -0500 (Thu, 26 Jan 2012) New Revision: 14267 Modified: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/Transaction.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction/Transaction.java Log: JBSEAM-4857 - added java:jboss/UserTransaction Transaction Name lookup Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction/Transaction.java =================================================================== --- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction/Transaction.java 2012-01-26 15:44:11 UTC (rev 14266) +++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction/Transaction.java 2012-01-26 16:19:18 UTC (rev 14267) @@ -90,6 +90,10 @@ ut.getStatus(); //for glassfish, which can return an unusable UT return ut; } + catch (NamingException nnfe2) { + // Try the other JBoss location in JBoss AS7 + return (UserTransaction) context.lookup("java:jboss/UserTransaction"); + } catch (Exception e) { throw nnfe; Modified: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/Transaction.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/Transaction.java 2012-01-26 15:44:11 UTC (rev 14266) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/Transaction.java 2012-01-26 16:19:18 UTC (rev 14267) @@ -90,11 +90,17 @@ ut.getStatus(); //for glassfish, which can return an unusable UT return ut; } + catch (NamingException nnfe2) { + // Try the other JBoss location in JBoss AS7 + return (UserTransaction) context.lookup("java:jboss/UserTransaction"); + } catch (Exception e) { throw nnfe; } } } + + }