You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/09/29 00:36:43 UTC
svn commit: r1177091 -
/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Author: lu4242
Date: Wed Sep 28 22:36:43 2011
New Revision: 1177091
URL: http://svn.apache.org/viewvc?rev=1177091&view=rev
Log:
MYFACES-3337 param defined with f:param inside h:button or h:link has precedence over the same param defined in a faces-config navigation rule
Modified:
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=1177091&r1=1177090&r2=1177091&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Wed Sep 28 22:36:43 2011
@@ -1831,7 +1831,14 @@ public final class HtmlRendererUtils {
{
parameters = new HashMap<String, List<String>>();
}
- parameters.putAll(navigationCaseParams);
+ //parameters.putAll(navigationCaseParams);
+ for (Map.Entry<String, List<String>> entry : navigationCaseParams.entrySet())
+ {
+ if (!parameters.containsKey(entry.getKey()))
+ {
+ parameters.put(entry.getKey(), entry.getValue());
+ }
+ }
}
if (parameters == null)