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

[Gavin King]

  User: gavin   
  Date: 07/03/08 03:24:36

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  JBSEAM-954
  
  Revision  Changes    Path
  1.42      +8 -0      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.41
  retrieving revision 1.42
  diff -u -b -r1.41 -r1.42
  --- AbstractSeamPhaseListener.java	8 Mar 2007 07:48:20 -0000	1.41
  +++ AbstractSeamPhaseListener.java	8 Mar 2007 08:24:36 -0000	1.42
  @@ -27,6 +27,7 @@
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Pageflow;
   import org.jboss.seam.core.Pages;
  +import org.jboss.seam.core.PersistenceContexts;
   import org.jboss.seam.core.Switcher;
   import org.jboss.seam.core.Validation;
   import org.jboss.seam.log.LogProvider;
  @@ -138,6 +139,7 @@
            Pageflow.instance().processEvents(name);
         }
      }
  +   
      public void afterPhase(PhaseEvent event)
      {
         if ( Contexts.isApplicationContextActive() )
  @@ -145,6 +147,7 @@
            Events.instance().raiseEvent("org.jboss.seam.afterPhase", event);
         }
      }
  +   
      protected void beforeUpdateModelValues(PhaseEvent event)
      {
         Pages.instance().applyViewRootValues( event.getFacesContext() );
  @@ -154,6 +157,7 @@
       * Give the subclasses an opportunity to do stuff
       */
      protected void afterInvokeApplication() {}
  +   
      /**
       * Add a faces message when Seam-managed transactions fail.
       */
  @@ -172,6 +176,7 @@
         }
         catch (Exception e) {} //swallow silently, not important
      }
  +   
      protected void beforeRender(PhaseEvent event)
      {  
         
  @@ -216,6 +221,7 @@
         FacesPage.instance().storeConversation();
         FacesPage.instance().storePageflow();
         
  +      PersistenceContexts.instance().beforeRender();
      }
      
      protected void afterRender(FacesContext facesContext)
  @@ -224,6 +230,8 @@
         //and pageflows can begin during render
         Manager.instance().prepareBackswitch(facesContext);
         
  +      PersistenceContexts.instance().afterRender();
  +      
         ExternalContext externalContext = facesContext.getExternalContext();
         Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );
         Lifecycle.endRequest(externalContext);