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

[Gavin King]

  User: gavin   
  Date: 06/10/23 16:35:28

  Modified:    src/main/org/jboss/seam/core   Manager.java Pageflow.java
  Log:
  minor
  
  Revision  Changes    Path
  1.98      +12 -1     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.97
  retrieving revision 1.98
  diff -u -b -r1.97 -r1.98
  --- Manager.java	20 Oct 2006 00:35:34 -0000	1.97
  +++ Manager.java	23 Oct 2006 20:35:28 -0000	1.98
  @@ -41,7 +41,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.97 $
  + * @version $Revision: 1.98 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -347,6 +347,11 @@
               Contexts.getPageContext().set( CONVERSATION_ID, getCurrentConversationId() );
               Contexts.getPageContext().set( CONVERSATION_IS_LONG_RUNNING, true );
            }
  +         else
  +         {
  +            Contexts.getPageContext().remove(CONVERSATION_ID);
  +            Contexts.getPageContext().remove(CONVERSATION_IS_LONG_RUNNING);
  +         }
         }
         writeConversationIdToResponse( response, getCurrentConversationId() );
         
  @@ -359,6 +364,12 @@
               Contexts.getPageContext().set( PAGEFLOW_NODE_NAME, pageflow.getNode().getName() );
               Contexts.getPageContext().set( PAGEFLOW_COUNTER, pageflow.getPageflowCounter() );
            }
  +         else
  +         {
  +            Contexts.getPageContext().remove(PAGEFLOW_NAME);
  +            Contexts.getPageContext().remove(PAGEFLOW_NODE_NAME);
  +            Contexts.getPageContext().remove(PAGEFLOW_COUNTER);
  +         }
         }
      }
   
  
  
  
  1.33      +1 -1      jboss-seam/src/main/org/jboss/seam/core/Pageflow.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pageflow.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pageflow.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -b -r1.32 -r1.33
  --- Pageflow.java	10 Oct 2006 19:37:38 -0000	1.32
  +++ Pageflow.java	23 Oct 2006 20:35:28 -0000	1.33
  @@ -79,7 +79,7 @@
            boolean canReposition = getPage().isBackEnabled() && 
                  processInstance.getProcessDefinition().getName().equals(pageflowName) && //probably not necessary
                  pageflowNodeName!=null; //probably not necessary
  -         if ( canReposition )
  +         if (canReposition)
            {
               //check the node name to make sure we are still on the same node
               if ( !pageflowNodeName.equals( getNode().getName() ) )