[jboss-cvs] jboss-seam/src/main/org/jboss/seam/util ...

[Gavin King]

  User: gavin   
  Date: 07/05/30 14:53:47

  Modified:    src/main/org/jboss/seam/util   Work.java
  Removed:     src/main/org/jboss/seam/util   Transactions.java
  Log:
  apply JBSEAM-1144
  make Transaction management be a component that implements UserTransaction
  no longer need to roll back txns at end of request, due to JBAS-3242 being fixed
  
  Revision  Changes    Path
  1.5       +3 -2      jboss-seam/src/main/org/jboss/seam/util/Work.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Work.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/util/Work.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Work.java	16 Dec 2006 10:17:14 -0000	1.4
  +++ Work.java	30 May 2007 18:53:47 -0000	1.5
  @@ -2,6 +2,7 @@
   
   import javax.transaction.UserTransaction;
   
  +import org.jboss.seam.core.Transaction;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   
  @@ -23,9 +24,9 @@
      
      public final T workInTransaction() throws Exception
      {
  -      boolean transactionActive = Transactions.isTransactionActiveOrMarkedRollback();
  +      boolean transactionActive = Transaction.instance().isActiveOrMarkedRollback();
         boolean begin = isNewTransactionRequired(transactionActive);
  -      UserTransaction userTransaction = begin ? Transactions.getUserTransaction() : null;
  +      UserTransaction userTransaction = begin ? Transaction.instance() : null;
         
         if (begin) 
         {