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

[Gavin King]

  User: gavin   
  Date: 07/03/08 02:48:20

  Modified:    src/main/org/jboss/seam/core   ConversationEntry.java
                        PersistenceContexts.java
  Log:
  JBSEAM-954
  
  Revision  Changes    Path
  1.37      +0 -1      jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationEntry.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- ConversationEntry.java	8 Mar 2007 07:34:14 -0000	1.36
  +++ ConversationEntry.java	8 Mar 2007 07:48:20 -0000	1.37
  @@ -1,7 +1,6 @@
   package org.jboss.seam.core;
   
   import java.io.Serializable;
  -import java.util.Collections;
   import java.util.Date;
   import java.util.List;
   import java.util.concurrent.TimeUnit;
  
  
  
  1.5       +12 -3     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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PersistenceContexts.java	2 Feb 2007 19:41:36 -0000	1.4
  +++ PersistenceContexts.java	8 Mar 2007 07:48:20 -0000	1.5
  @@ -1,10 +1,15 @@
   package org.jboss.seam.core;
  +
   import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.annotations.Install.BUILT_IN;
  +
   import java.io.Serializable;
   import java.util.Collections;
   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;
  @@ -13,6 +18,9 @@
   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")
   @Scope(ScopeType.CONVERSATION)
   @Intercept(NEVER)
  @@ -25,7 +33,8 @@
    
      public FlushModeType getFlushMode()
      {
  -      return flushMode;
  +      return Lifecycle.getPhaseId()==PhaseId.RENDER_RESPONSE ? 
  +               PersistenceProvider.instance().getRenderFlushMode() : flushMode;
      }
      
      public Set<String> getTouchedContexts()
  @@ -49,6 +58,7 @@
            return null;
         }
      }
  +   
      public void changeFlushMode(FlushModeType flushMode)
      {
         this.flushMode = flushMode;
  @@ -60,7 +70,6 @@
               pcm.changeFlushMode(flushMode);
            }
         }
  -      
      }
      
   }