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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/interceptors 
                        RollbackInterceptor.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.19      +4 -4      jboss-seam/src/main/org/jboss/seam/interceptors/RollbackInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RollbackInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/RollbackInterceptor.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- RollbackInterceptor.java	12 Mar 2007 05:36:00 -0000	1.18
  +++ RollbackInterceptor.java	30 May 2007 18:53:46 -0000	1.19
  @@ -1,4 +1,4 @@
  -//$Id: RollbackInterceptor.java,v 1.18 2007/03/12 05:36:00 gavin Exp $
  +//$Id: RollbackInterceptor.java,v 1.19 2007/05/30 18:53:46 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import static org.jboss.seam.ComponentType.JAVA_BEAN;
  @@ -13,8 +13,8 @@
   import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.Outcome;
   import org.jboss.seam.annotations.Rollback;
  +import org.jboss.seam.core.Transaction;
   import org.jboss.seam.intercept.InvocationContext;
  -import org.jboss.seam.util.Transactions;
   
   /**
    * Automatically sets transactions to rollback only.
  @@ -34,7 +34,7 @@
            final Object result = invocation.proceed();
            if ( isRollbackRequired( invocation.getMethod(), result ) )
            {
  -            Transactions.setTransactionRollbackOnly();
  +            Transaction.instance().setRollbackOnly();
            }
            return result;
         }
  @@ -47,7 +47,7 @@
               {
                  try
                  {
  -                  Transactions.setTransactionRollbackOnly();
  +                  Transaction.instance().setRollbackOnly();
                  }
                  catch (Exception te) {} //swallow
               }