Updated Branches: refs/heads/wicket-1.5.x 0b8c65a1e -> 722b2804f
WICKET-4398 Any empty url-parameter will make wicket 1.5 crash Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/722b2804 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/722b2804 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/722b2804 Branch: refs/heads/wicket-1.5.x Commit: 722b2804f1ce9f2b4eef84af14eada35f28468b3 Parents: 0b8c65a Author: martin-g <[email protected]> Authored: Thu Feb 9 12:25:15 2012 +0200 Committer: martin-g <[email protected]> Committed: Thu Feb 9 12:25:15 2012 +0200 ---------------------------------------------------------------------- .../request/mapper/parameter/PageParameters.java | 2 +- .../java/org/apache/wicket/request/UrlTest.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/722b2804/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java index e00bb74..8a8a387 100644 --- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java @@ -337,7 +337,7 @@ public class PageParameters implements IClusterable, IIndexedParameters, INamedP */ public NamedPair(final String key, final String value) { - this.key = Args.notEmpty(key, "key");; + this.key = Args.notNull(key, "key");; this.value = Args.notNull(value, "value"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/722b2804/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java b/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java index 5c24416..28eca68 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java @@ -199,7 +199,6 @@ public class UrlTest extends Assert checkQueryParams(url, "", "b"); } - /** * https://issues.apache.org/jira/browse/WICKET-4398 */ @@ -213,6 +212,17 @@ public class UrlTest extends Assert } /** + * https://issues.apache.org/jira/browse/WICKET-4398 + */ + @Test + public void testParse14() + { + String s = "/?a=b&+"; + Url url = Url.parse(s); + checkSegments(url, "", ""); + checkQueryParams(url, "a", "b", " ", ""); + } + /** * */ @Test
