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

[Gavin King]

  User: gavin   
  Date: 06/12/16 05:03:45

  Modified:    src/main/org/jboss/seam/util  Work.java
  Log:
  JBSEAM-595
  
  Revision  Changes    Path
  1.3       +4 -3      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Work.java	16 Dec 2006 02:58:13 -0000	1.2
  +++ Work.java	16 Dec 2006 10:03:45 -0000	1.3
  @@ -11,14 +11,15 @@
      
      protected abstract T work() throws Exception;
      
  -   protected boolean isTransactional()
  +   protected boolean isNewTransactionRequired(boolean transactionActive)
      {
  -      return true;
  +      return !transactionActive;
      }
      
      public final T workInTransaction() throws Exception
      {
  -      boolean begin = isTransactional() && !Transactions.isTransactionActiveOrMarkedRollback();
  +      boolean transactionActive = Transactions.isTransactionActiveOrMarkedRollback();
  +      boolean begin = isNewTransactionRequired(transactionActive);
         UserTransaction userTransaction = begin ? Transactions.getUserTransaction() : null;
         
         if (begin)