You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/02/19 11:32:41 UTC

git commit: WICKET-4417 CombinedRequestParametersAdapter ignores duplicate values for the same parameter name

Updated Branches:
  refs/heads/master eacb3d54f -> e095f49f1


WICKET-4417 CombinedRequestParametersAdapter ignores duplicate values for the same parameter name


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e095f49f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e095f49f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e095f49f

Branch: refs/heads/master
Commit: e095f49f19f131a106e1c4677a9bca2afb30c2b9
Parents: eacb3d5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Feb 19 11:32:25 2012 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Feb 19 11:32:25 2012 +0100

----------------------------------------------------------------------
 .../CombinedRequestParametersAdapter.java          |    5 +-
 .../CombinedRequestParametersAdapterTest.java      |   49 +++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/e095f49f/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java b/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
index b5792cc..2564eb7 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapter.java
@@ -88,10 +88,7 @@ public class CombinedRequestParametersAdapter implements IRequestParameters
 			{
 				for (StringValue v : values)
 				{
-					if (!result.contains(v))
-					{
-						result.add(v);
-					}
+					result.add(v);
 				}
 			}
 		}

http://git-wip-us.apache.org/repos/asf/wicket/blob/e095f49f/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java b/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java
new file mode 100644
index 0000000..1cd610d
--- /dev/null
+++ b/wicket-request/src/test/java/org/apache/wicket/request/parameter/CombinedRequestParametersAdapterTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.request.parameter;
+
+import java.util.List;
+
+import org.apache.wicket.request.Url;
+import org.apache.wicket.util.string.*;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @since 1.5.5
+ */
+public class CombinedRequestParametersAdapterTest extends Assert
+{
+	/**
+	 * Tests that org.apache.wicket.request.parameter.CombinedRequestParametersAdapter#getParameterValues(java.lang.String)
+	 * will return all values for a given parameter by name.
+	 *
+	 * https://issues.apache.org/jira/browse/WICKET-4417
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void getParameterValuesSameNameSameValue() throws Exception
+	{
+		Url url = Url.parse("?param1=value1&param1=value1");
+		UrlRequestParametersAdapter urlAdapter = new UrlRequestParametersAdapter(url);
+		CombinedRequestParametersAdapter adapter = new CombinedRequestParametersAdapter(urlAdapter);
+
+		List<StringValue> values = adapter.getParameterValues("param1");
+		assertEquals(2, values.size());
+	}
+}