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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/transaction   Transaction.java
                        UserTransaction.java
  Log:
  work around lame handling of tx timeouts in 4.2
  
  Revision  Changes    Path
  1.6       +3 -3      jboss-seam/src/main/org/jboss/seam/transaction/Transaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Transaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/Transaction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Transaction.java	12 Jun 2007 17:48:50 -0000	1.5
  +++ Transaction.java	13 Jun 2007 15:21:08 -0000	1.6
  @@ -70,17 +70,17 @@
         }
      }
   
  -   protected NoTransaction createNoTransaction()
  +   protected UserTransaction createNoTransaction()
      {
         return new NoTransaction();
      }
   
  -   protected EJBTransaction createEJBTransaction() throws NamingException
  +   protected UserTransaction createEJBTransaction() throws NamingException
      {
         return new EJBTransaction( EJB.getEJBContext() );
      }
   
  -   protected UTTransaction createUTTransaction() throws NamingException
  +   protected UserTransaction createUTTransaction() throws NamingException
      {
         return new UTTransaction( getUserTransaction() );
      }
  
  
  
  1.3       +8 -2      jboss-seam/src/main/org/jboss/seam/transaction/UserTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UserTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/transaction/UserTransaction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UserTransaction.java	12 Jun 2007 17:48:50 -0000	1.2
  +++ UserTransaction.java	13 Jun 2007 15:21:08 -0000	1.3
  @@ -4,6 +4,7 @@
   import static javax.transaction.Status.STATUS_MARKED_ROLLBACK;
   import static javax.transaction.Status.STATUS_ROLLEDBACK;
   import static javax.transaction.Status.STATUS_COMMITTED;
  +import static javax.transaction.Status.STATUS_NO_TRANSACTION;
   
   import javax.transaction.SystemException;
   
  @@ -28,10 +29,10 @@
         return status == STATUS_ACTIVE || status == STATUS_MARKED_ROLLBACK;
      }
   
  -   public boolean isCommittedOrRolledBack() throws SystemException
  +   public boolean isRolledBackOrMarkedRollback() throws SystemException
      {
         int status = getStatus();
  -      return status == STATUS_COMMITTED || status == STATUS_ROLLEDBACK;
  +      return status == STATUS_ROLLEDBACK || status == STATUS_MARKED_ROLLBACK;
      }
   
      public boolean isMarkedRollback() throws SystemException
  @@ -39,6 +40,11 @@
         return getStatus() == STATUS_MARKED_ROLLBACK;
      }
   
  +   public boolean isNoTransaction() throws SystemException
  +   {
  +      return getStatus() == STATUS_NO_TRANSACTION;
  +   }
  +
      public boolean isRolledBack() throws SystemException
      {
         return getStatus() == STATUS_ROLLEDBACK;