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

[Gavin King]

  User: gavin   
  Date: 06/08/29 19:15:23

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fixed bug in s:conversationPropagation type=none / s:link propagation=none
  
  Revision  Changes    Path
  1.82      +6 -7      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.81
  retrieving revision 1.82
  diff -u -b -r1.81 -r1.82
  --- Manager.java	25 Jul 2006 04:40:43 -0000	1.81
  +++ Manager.java	29 Aug 2006 23:15:23 -0000	1.82
  @@ -44,7 +44,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.81 $
  + * @version $Revision: 1.82 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -538,16 +538,19 @@
            log.debug("Found conversation id in request parameter: " + storedConversationId);
         }
         
  -      //deprecated?
  +      //TODO: this approach is deprecated, remove code:
         if ( "new".equals(storedConversationId) )
         {
            storedConversationId = null;
  +         isLongRunningConversation = false;
         }
  +      //end code to remove
   
         String propagation = getPropagationFromRequestParameter(parameters);
         if ( "none".equals(propagation) )
         {
            storedConversationId = null;
  +         isLongRunningConversation = false;
         }
   
         return restoreConversation(storedConversationId, isLongRunningConversation);
  @@ -906,11 +909,7 @@
         {
            url = encodeParameters(url, parameters);
         }
  -      Map<String, Object> renderParameters = RenderParameters.instance();
  -      if (renderParameters!=null)
  -      {
  -         url = encodeParameters(url, renderParameters);
  -      }
  +      url = encodeParameters( url, RenderParameters.instance() );
         if (includeConversationId)
         {
            url = encodeConversationId(url);