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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  work around lame handling of tx timeouts in 4.2
  
  Revision  Changes    Path
  1.51      +2 -2      jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractSeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -b -r1.50 -r1.51
  --- AbstractSeamPhaseListener.java	10 Jun 2007 19:25:59 -0000	1.50
  +++ AbstractSeamPhaseListener.java	13 Jun 2007 15:21:07 -0000	1.51
  @@ -138,7 +138,7 @@
      {
         try
         {
  -         if ( Transaction.instance().isMarkedRollback() )
  +         if ( Transaction.instance().isRolledBackOrMarkedRollback() )
            {
               FacesMessages.instance().addFromResourceBundleOrDefault(
                        FacesMessage.SEVERITY_WARN, 
  @@ -282,7 +282,7 @@
               log.debug("committing transaction after phase: " + phaseId);
               Transaction.instance().commit();
            }
  -         else if ( Transaction.instance().isMarkedRollback() )
  +         else if ( Transaction.instance().isRolledBackOrMarkedRollback() )
            {
               log.debug("rolling back transaction after phase: " + phaseId);
               Transaction.instance().rollback();