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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/framework  Controller.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.8       +2 -2      jboss-seam/src/main/org/jboss/seam/framework/Controller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Controller.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Controller.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- Controller.java	25 Feb 2007 15:36:37 -0000	1.7
  +++ Controller.java	30 May 2007 18:53:46 -0000	1.8
  @@ -22,10 +22,10 @@
   import org.jboss.seam.core.Messages;
   import org.jboss.seam.core.Redirect;
   import org.jboss.seam.core.Renderer;
  +import org.jboss.seam.core.Transaction;
   import org.jboss.seam.core.Validation;
   import org.jboss.seam.log.Log;
   import org.jboss.seam.security.Identity;
  -import org.jboss.seam.util.Transactions;
   
   /**
    * Base class for controller objects. Provides various
  @@ -272,7 +272,7 @@
      {
         try
         {
  -         return Transactions.isTransactionMarkedRollback();
  +         return Transaction.instance().isMarkedRollback();
         }
         catch (Exception e)
         {