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

[Norman Richards]

  User: nrichards
  Date: 07/03/10 22:24:42

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  fix to make unit tests run
  
  Revision  Changes    Path
  1.43      +8 -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.42
  retrieving revision 1.43
  diff -u -b -r1.42 -r1.43
  --- AbstractSeamPhaseListener.java	8 Mar 2007 08:24:36 -0000	1.42
  +++ AbstractSeamPhaseListener.java	11 Mar 2007 03:24:42 -0000	1.43
  @@ -221,7 +221,10 @@
         FacesPage.instance().storeConversation();
         FacesPage.instance().storePageflow();
         
  -      PersistenceContexts.instance().beforeRender();
  +      PersistenceContexts persistenceContexts = PersistenceContexts.instance();
  +      if (persistenceContexts != null) {
  +          persistenceContexts.beforeRender();
  +      }
      }
      
      protected void afterRender(FacesContext facesContext)
  @@ -230,7 +233,10 @@
         //and pageflows can begin during render
         Manager.instance().prepareBackswitch(facesContext);
         
  -      PersistenceContexts.instance().afterRender();
  +      PersistenceContexts persistenceContexts = PersistenceContexts.instance();
  +      if (persistenceContexts != null) {
  +          persistenceContexts.afterRender();
  +      }
         
         ExternalContext externalContext = facesContext.getExternalContext();
         Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );