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

[Gavin King]

  User: gavin   
  Date: 06/08/30 21:38:29

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fixed breakage
  
  Revision  Changes    Path
  1.83      +7 -3      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.82
  retrieving revision 1.83
  diff -u -b -r1.82 -r1.83
  --- Manager.java	29 Aug 2006 23:15:23 -0000	1.82
  +++ Manager.java	31 Aug 2006 01:38:29 -0000	1.83
  @@ -44,7 +44,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.82 $
  + * @version $Revision: 1.83 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -898,7 +898,7 @@
       * into the request URL.
       * 
       * @param viewId the JSF view id
  -    * @param parameters request parameters to be encoded
  +    * @param parameters request parameters to be encoded (possibly null)
       * @param includeConversationId determines if the conversation id is to be encoded
       */
      public void redirect(String viewId, Map<String, Object> parameters, boolean includeConversationId)
  @@ -909,7 +909,11 @@
         {
            url = encodeParameters(url, parameters);
         }
  -      url = encodeParameters( url, RenderParameters.instance() );
  +      Map<String, Object> renderParameters = RenderParameters.instance();
  +      if (renderParameters!=null)
  +      {
  +         url = encodeParameters(url, renderParameters);
  +      }
         if (includeConversationId)
         {
            url = encodeConversationId(url);