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

[Gavin King]

  User: gavin   
  Date: 07/06/03 16:01:22

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fix bad bug JBSEAM-1392
  
  Revision  Changes    Path
  1.163     +8 -6      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.162
  retrieving revision 1.163
  diff -u -b -r1.162 -r1.163
  --- Manager.java	3 Jun 2007 17:52:15 -0000	1.162
  +++ Manager.java	3 Jun 2007 20:01:22 -0000	1.163
  @@ -44,7 +44,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.162 $
  + * @version $Revision: 1.163 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -437,17 +437,19 @@
         {
            Page page = Pages.instance().getPage(viewId);
            storedConversationId = page.getConversationIdParameter().getRequestConversationId(parameters);
  -         //isLongRunningConversation = false; //TODO: think about this further...
  -         isLongRunningConversation = "true".equals( getRequestParameterValue(parameters, conversationIsLongRunningParameter) );
  +         //TODO: how about the parent conversation id?
         }
         
  -      //Next, try to get the conversation id from the globally defined request parameter      
  +      //Next, try to get the conversation id from the globally defined request parameters
         if (storedConversationId==null)
         {
            storedConversationId = getRequestParameterValue(parameters, conversationIdParameter);   
  +      }
  +      if (storedParentConversationId==null)
  +      {
            storedParentConversationId = getRequestParameterValue(parameters, parentConversationIdParameter);
  -         isLongRunningConversation = "true".equals( getRequestParameterValue(parameters, conversationIsLongRunningParameter) );
         }
  +      isLongRunningConversation = "true".equals( getRequestParameterValue(parameters, conversationIsLongRunningParameter) );
               
         if ( isMissing(storedConversationId) )
         {