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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/core  PersistenceContexts.java
  Log:
  JBSEAM-954
  
  Revision  Changes    Path
  1.6       +14 -5     jboss-seam/src/main/org/jboss/seam/core/PersistenceContexts.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PersistenceContexts.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PersistenceContexts.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- PersistenceContexts.java	8 Mar 2007 07:48:20 -0000	1.5
  +++ PersistenceContexts.java	8 Mar 2007 08:24:36 -0000	1.6
  @@ -8,8 +8,6 @@
   import java.util.HashSet;
   import java.util.Set;
   
  -import javax.faces.event.PhaseId;
  -
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.FlushModeType;
  @@ -18,7 +16,6 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.persistence.PersistenceProvider;
   
   @Name("org.jboss.seam.core.persistenceContexts")
  @@ -30,11 +27,11 @@
      private static final long serialVersionUID = -4897350516435283182L;
      private Set<String> set = new HashSet<String>();
      private FlushModeType flushMode = FlushModeType.AUTO;
  +   private FlushModeType actualFlushMode;
    
      public FlushModeType getFlushMode()
      {
  -      return Lifecycle.getPhaseId()==PhaseId.RENDER_RESPONSE ? 
  -               PersistenceProvider.instance().getRenderFlushMode() : flushMode;
  +      return flushMode;
      }
      
      public Set<String> getTouchedContexts()
  @@ -72,4 +69,16 @@
         }   
      }
      
  +   public void beforeRender()
  +   {
  +      actualFlushMode = flushMode;
  +      PersistenceProvider pp = PersistenceProvider.instance();
  +      changeFlushMode( pp==null ? FlushModeType.MANUAL : pp.getRenderFlushMode() );
  +   }
  +   
  +   public void afterRender()
  +   {
  +      changeFlushMode(actualFlushMode);
  +   }
  +   
   }