Author: dan.j.allen Date: 2008-10-08 19:41:15 -0400 (Wed, 08 Oct 2008) New Revision: 9240 Modified: branches/community/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java branches/community/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java Log: JBSEAM-3535 Modified: branches/community/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java =================================================================== --- branches/community/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2008-10-08 23:41:03 UTC (rev 9239) +++ branches/community/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2008-10-08 23:41:15 UTC (rev 9240) @@ -110,10 +110,13 @@ url.addParameter(uiTaskId); } - UISelection uiSelection = getSelection(); - if (uiSelection != null) + if (!usedParameters.contains("dataModelSelection")) { - url.addParameter(uiSelection); + UISelection uiSelection = getSelection(); + if (uiSelection != null) + { + url.addParameter(uiSelection); + } } encodedUrl = url.getEncodedUrl(); Modified: branches/community/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java =================================================================== --- branches/community/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java 2008-10-08 23:41:03 UTC (rev 9239) +++ branches/community/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java 2008-10-08 23:41:15 UTC (rev 9240) @@ -40,7 +40,7 @@ public void addParameter(UIParameter parameter) throws UnsupportedEncodingException { String name = parameter.getName(); - if (!(name.equals(page.getConversationIdParameter().getParameterName()) + if (parameter.getValue() != null && !(name.equals(page.getConversationIdParameter().getParameterName()) && getParameters().containsKey(name))) { super.addParameter(parameter); @@ -51,4 +51,4 @@ public String getEncodedUrl() { return FacesContext.getCurrentInstance().getExternalContext().encodeActionURL(super.getEncodedUrl()); } -} \ No newline at end of file +}