svn commit: r1058160 - /myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java

[ba...@apache.org]

Author: baranda
Date: Wed Jan 12 14:49:09 2011
New Revision: 1058160

URL: http://svn.apache.org/viewvc?rev=1058160&view=rev
Log:
[ORCHESTRA-56] When used with Prettyfaces, the conversationContext param is added to the URL multiple times

Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java?rev=1058160&r1=1058159&r2=1058160&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java Wed Jan 12 14:49:09 2011
@@ -184,6 +184,14 @@ public class RequestParameterProviderMan
             {
                 nuofParams++;
 
+                // skip adding this parameter if already found in the URL.
+                // For instance, to avoid adding multiple conversationContext if the
+                // encodeURL method is invoked multiple times.
+                if (url.indexOf(fields[i]) > 0)
+                {
+                    continue;
+                }
+
                 sb.append(nuofParams == 0 ? firstSeparator : PARAMETER_SEP);
                 sb.append(fields[i]);
                 sb.append("=");