Complement for WICKET-4664 Url#toString() was not reflecting the new behavior for getQueryString()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2fcb3417 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2fcb3417 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2fcb3417 Branch: refs/heads/wicket-4774 Commit: 2fcb34178a13b54e9718f40b0b4fe19475fa5dad Parents: ff4ebd8 Author: Cedric Gatay <[email protected]> Authored: Wed May 1 19:09:28 2013 +0200 Committer: Cedric Gatay <[email protected]> Committed: Wed May 1 19:09:28 2013 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/request/Url.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2fcb3417/wicket-request/src/main/java/org/apache/wicket/request/Url.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/Url.java b/wicket-request/src/main/java/org/apache/wicket/request/Url.java index c9ddc69..2e24b5c 100755 --- a/wicket-request/src/main/java/org/apache/wicket/request/Url.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/Url.java @@ -714,7 +714,12 @@ public class Url implements Serializable result.append(path); - result.append(getQueryString(charset)); + + final String queryString = getQueryString(charset); + if (queryString != null) + { + result.append('?').append(queryString); + } return result.toString(); }
