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

[Gavin King]

  User: gavin   
  Date: 07/02/07 18:52:54

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  encode parameters
  
  Revision  Changes    Path
  1.141     +20 -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.140
  retrieving revision 1.141
  diff -u -b -r1.140 -r1.141
  --- Manager.java	6 Feb 2007 23:29:47 -0000	1.140
  +++ Manager.java	7 Feb 2007 23:52:54 -0000	1.141
  @@ -10,6 +10,8 @@
   import static org.jboss.seam.annotations.Install.BUILT_IN;
   
   import java.io.IOException;
  +import java.io.UnsupportedEncodingException;
  +import java.net.URLEncoder;
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.List;
  @@ -41,7 +43,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.140 $
  + * @version $Revision: 1.141 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -818,7 +820,7 @@
                     .append( url.contains("?") ? '&' : '?' )
                     .append(conversationIdParameter)
                     .append('=')
  -                  .append( getParentConversationId() )
  +                  .append( encode( getParentConversationId() ) )
                     .append('&')
                     .append(conversationIsLongRunningParameter)
                     .append("=true")
  @@ -836,13 +838,13 @@
                  .append( url.contains("?") ? '&' : '?' )
                  .append(conversationIdParameter)
                  .append('=')
  -               .append( getCurrentConversationId() );
  +               .append( encode( getCurrentConversationId() ) );
            if ( isNestedConversation() && !isReallyLongRunningConversation() )
            {
               builder.append('&')
                     .append(parentConversationIdParameter)
                     .append('=')
  -                  .append( getParentConversationId() );
  +                  .append( encode( getParentConversationId() ) );
            }
            if ( isReallyLongRunningConversation() )
            {
  @@ -904,7 +906,7 @@
                     .append('=');
                  if (value!=null)
                  {
  -                  builder.append(value);
  +                  builder.append(encode(value));
                  }
               }
            }
  @@ -915,7 +917,7 @@
                     .append('=');
               if (parameterValue!=null)
               {
  -               builder.append(parameterValue);
  +               builder.append(encode(parameterValue));
               }
            }
         }
  @@ -926,6 +928,18 @@
         return builder.toString();
      }
      
  +   private String encode(Object value)
  +   {
  +      try
  +      {
  +         return URLEncoder.encode(String.valueOf(value),"UTF-8");
  +      }
  +      catch (UnsupportedEncodingException iee)
  +      {
  +         throw new RuntimeException(iee);
  +      }
  +   }
  +   
      /**
       * Redirect to the given view id, after encoding parameters and conversation id 
       * into the request URL.