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

[Gavin King]

  User: gavin   
  Date: 06/10/13 01:30:26

  Modified:    src/main/org/jboss/seam/interceptors  
                        ConversationInterceptor.java
                        ManagedEntityIdentityInterceptor.java
  Log:
  fixed JBSEAM-369
  
  Revision  Changes    Path
  1.51      +3 -6      jboss-seam/src/main/org/jboss/seam/interceptors/ConversationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ConversationInterceptor.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -b -r1.50 -r1.51
  --- ConversationInterceptor.java	10 Oct 2006 21:00:53 -0000	1.50
  +++ ConversationInterceptor.java	13 Oct 2006 05:30:26 -0000	1.51
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.50 2006/10/10 21:00:53 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.51 2006/10/13 05:30:26 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -16,12 +16,12 @@
   import org.jboss.seam.annotations.FlushModeType;
   import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.StartTask;
  -import org.jboss.seam.core.Conversation;
   import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.ConversationEntry;
   import org.jboss.seam.core.Interpolator;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Pageflow;
  +import org.jboss.seam.core.PersistenceContexts;
   
   /**
    * After the end of the invocation, begin or end a long running
  @@ -165,10 +165,7 @@
            return;
         }
         
  -      if (flushMode!=FlushModeType.AUTO)
  -      {
  -         Conversation.instance().setFlushMode(flushMode);
  -      }
  +      PersistenceContexts.instance().changeFlushMode(flushMode);
      }
   
      private String getProcessDefinitionName(Method method) {
  
  
  
  1.9       +2 -2      jboss-seam/src/main/org/jboss/seam/interceptors/ManagedEntityIdentityInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedEntityIdentityInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ManagedEntityIdentityInterceptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- ManagedEntityIdentityInterceptor.java	12 Oct 2006 08:32:38 -0000	1.8
  +++ ManagedEntityIdentityInterceptor.java	13 Oct 2006 05:30:26 -0000	1.9
  @@ -16,7 +16,7 @@
   import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Interceptor;
  -import org.jboss.seam.core.TouchedContexts;
  +import org.jboss.seam.core.PersistenceContexts;
   import org.jboss.seam.persistence.PersistenceProvider;
   import org.jboss.seam.util.Reflections;
   
  @@ -81,7 +81,7 @@
      
      public void entityRefsToIds(InvocationContext ctx) throws Exception
      {      
  -      TouchedContexts touchedContexts = TouchedContexts.instance();
  +      PersistenceContexts touchedContexts = PersistenceContexts.instance();
         if ( touchedContexts!=null && touchedContexts.getTouchedContexts().size()>0 )
         {
            Set<String> pcs = touchedContexts.getTouchedContexts();