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

[Gavin King]

  User: gavin   
  Date: 07/06/13 11:21:08

  Modified:    src/main/org/jboss/seam/web  ExceptionFilter.java
  Log:
  work around lame handling of tx timeouts in 4.2
  
  Revision  Changes    Path
  1.10      +7 -4      jboss-seam/src/main/org/jboss/seam/web/ExceptionFilter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExceptionFilter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ExceptionFilter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- ExceptionFilter.java	30 May 2007 20:16:00 -0000	1.9
  +++ ExceptionFilter.java	13 Jun 2007 15:21:08 -0000	1.10
  @@ -33,11 +33,13 @@
   import org.jboss.seam.mock.MockExternalContext;
   import org.jboss.seam.mock.MockFacesContext;
   import org.jboss.seam.transaction.Transaction;
  +import org.jboss.seam.transaction.UserTransaction;
   import org.jboss.seam.util.EJB;
   
   /**
  - * As a last line of defence, rollback uncommitted transactions 
  - * at the very end of the request.
  + * Delegate uncaught exceptions to Seam exception handling.
  + * As a last line of defence, rollback uncommitted transactions,
  + * and clean up Seam contexts.
    * 
    * @author Gavin King
    */
  @@ -120,10 +122,11 @@
      {
         try 
         {
  -         if ( Transaction.instance().isActiveOrMarkedRollback() )
  +         UserTransaction transaction = Transaction.instance();
  +         if ( transaction.isActiveOrMarkedRollback() || transaction.isRolledBack() )
            {
               log.debug("killing transaction");
  -            Transaction.instance().rollback();
  +            transaction.rollback();
            }
         }
         catch (Exception te)