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

[Gavin King]

  User: gavin   
  Date: 06/11/08 12:32:43

  Modified:    src/main/org/jboss/seam/jsf   
                        AbstractSeamPhaseListener.java
                        TransactionalSeamPhaseListener.java
                        TransactionalSeamPortletPhaseListener.java
  Log:
  fix JBSEAM-456, don't hit UT from a container txn
  
  Revision  Changes    Path
  1.23      +10 -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.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- AbstractSeamPhaseListener.java	4 Nov 2006 01:00:14 -0000	1.22
  +++ AbstractSeamPhaseListener.java	8 Nov 2006 17:32:43 -0000	1.23
  @@ -100,11 +100,19 @@
         Manager.instance().setUpdateModelValuesCalled(true);
      }
   
  -   protected void afterInvokeApplication()
  +   /**
  +    * Give the subclasses an opportunity to do stuff
  +    */
  +   protected void afterInvokeApplication() {}
  +
  +   /**
  +    * Add a faces message when Seam-managed transactions fail.
  +    */
  +   protected void addTransactionFailedMessage()
      {
         try
         {
  -         if ( Transactions.isTransactionAvailableAndMarkedRollback() )
  +         if ( Transactions.isTransactionMarkedRollback() )
            {
               FacesMessages.instance().addFromResourceBundle(
                        FacesMessage.SEVERITY_WARN, 
  
  
  
  1.2       +6 -1      jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionalSeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPhaseListener.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TransactionalSeamPhaseListener.java	4 Nov 2006 01:27:43 -0000	1.1
  +++ TransactionalSeamPhaseListener.java	8 Nov 2006 17:32:43 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: TransactionalSeamPhaseListener.java,v 1.1 2006/11/04 01:27:43 gavin Exp $
  +//$Id: TransactionalSeamPhaseListener.java,v 1.2 2006/11/08 17:32:43 gavin Exp $
   package org.jboss.seam.jsf;
   
   import javax.faces.event.PhaseEvent;
  @@ -56,4 +56,9 @@
         }
      }
   
  +   @Override
  +   protected void afterInvokeApplication() {
  +      addTransactionFailedMessage();
  +   }
  +
   }
  
  
  
  1.2       +6 -1      jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPortletPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionalSeamPortletPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/TransactionalSeamPortletPhaseListener.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TransactionalSeamPortletPhaseListener.java	4 Nov 2006 01:27:43 -0000	1.1
  +++ TransactionalSeamPortletPhaseListener.java	8 Nov 2006 17:32:43 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: TransactionalSeamPortletPhaseListener.java,v 1.1 2006/11/04 01:27:43 gavin Exp $
  +//$Id: TransactionalSeamPortletPhaseListener.java,v 1.2 2006/11/08 17:32:43 gavin Exp $
   package org.jboss.seam.jsf;
   
   import javax.faces.event.PhaseEvent;
  @@ -55,4 +55,9 @@
         }
      }
   
  +   @Override
  +   protected void afterInvokeApplication() {
  +      addTransactionFailedMessage();
  +   }
  +
   }