From: Gavin K. <gav...@jb...> - 2005-11-21 07:31:45
|
User: gavin Date: 05/11/21 02:31:42 Modified: src/main/org/jboss/seam/util Transactions.java Log: added @Rollback Revision Changes Path 1.3 +19 -9 jboss-seam/src/main/org/jboss/seam/util/Transactions.java (In the diff below, changes in quantity of whitespace are not shown.) Index: Transactions.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/util/Transactions.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- Transactions.java 30 Sep 2005 13:01:01 -0000 1.2 +++ Transactions.java 21 Nov 2005 07:31:42 -0000 1.3 @@ -1,13 +1,13 @@ -//$Id: Transactions.java,v 1.2 2005/09/30 13:01:01 theute Exp $ +//$Id: Transactions.java,v 1.3 2005/11/21 07:31:42 gavin Exp $ package org.jboss.seam.util; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; -import java.util.Hashtable; import java.util.Map; import java.util.Properties; +import javax.ejb.EJBContext; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.transaction.Status; @@ -16,7 +16,6 @@ import org.jboss.logging.Logger; import org.jboss.seam.Seam; -import org.jboss.seam.core.Init; public class Transactions { @@ -29,8 +28,25 @@ return getUserTransaction().getStatus()==Status.STATUS_ACTIVE; } + public static boolean isTransactionActiveOrMarkedRollback() throws SystemException, NamingException + { + int status = getUserTransaction().getStatus(); + return status==Status.STATUS_ACTIVE || status == Status.STATUS_MARKED_ROLLBACK; + } + public static UserTransaction getUserTransaction() throws NamingException { + setupInitialContext(); + return (UserTransaction) initialContext.lookup("java:comp/UserTransaction"); + } + + public static EJBContext getEJBContext() throws NamingException + { + setupInitialContext(); + return (EJBContext) initialContext.lookup("java:comp/EJBContext"); + } + + private static void setupInitialContext() throws NamingException { if (initialContext == null) { // TODO: We shouldn't have to get the properties from seam.properties again @@ -54,12 +70,6 @@ } initialContext = NamingHelper.getInitialContext(properties); } - return (UserTransaction) initialContext.lookup("java:comp/UserTransaction"); } - public static boolean isTransactionActiveOrMarkedRollback() throws SystemException, NamingException - { - int status = getUserTransaction().getStatus(); - return status==Status.STATUS_ACTIVE || status == Status.STATUS_MARKED_ROLLBACK; - } } |