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

[Gavin King]

  User: gavin   
  Date: 06/10/25 17:21:03

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  minor
  
  Revision  Changes    Path
  1.104     +16 -11    jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -b -r1.103 -r1.104
  --- Manager.java	25 Oct 2006 21:18:55 -0000	1.103
  +++ Manager.java	25 Oct 2006 21:21:03 -0000	1.104
  @@ -41,7 +41,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.103 $
  + * @version $Revision: 1.104 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -339,6 +339,18 @@
         {
            //TODO: we really only need to execute this code when we are in the 
            //      RENDER_RESPONSE phase, ie. not before redirects
  +         store();
  +      }
  +      writeConversationIdToResponse( response, getCurrentConversationId() );
  +      
  +      if ( Contexts.isPageContextActive() && Init.instance().isJbpmInstalled() )
  +      {
  +         Pageflow.instance().store();
  +      }
  +   }
  +
  +   private void store()
  +   {
            if ( isReallyLongRunningConversation() )
            {
               Contexts.getPageContext().set( CONVERSATION_ID, getCurrentConversationId() );
  @@ -350,13 +362,6 @@
               Contexts.getPageContext().remove(CONVERSATION_IS_LONG_RUNNING);
            }
         }
  -      writeConversationIdToResponse( response, getCurrentConversationId() );
  -      
  -      if ( Contexts.isPageContextActive() && Init.instance().isJbpmInstalled() )
  -      {
  -         Pageflow.instance().store();
  -      }
  -   }
   
      private void discardTemporaryConversation(ContextAdaptor session, Object response)
      {