handle null pointer in MockHttpServletRequest when assembling url
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/56014cbf Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/56014cbf Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/56014cbf Branch: refs/heads/master Commit: 56014cbff6b49a618fa96a5ce55edec610e0a1e1 Parents: f9b1208 Author: Peter Ertl <[email protected]> Authored: Mon Feb 6 22:50:11 2012 +0100 Committer: Peter Ertl <[email protected]> Committed: Mon Feb 6 22:50:11 2012 +0100 ---------------------------------------------------------------------- .../protocol/http/mock/MockHttpServletRequest.java | 16 +++++++++++++- 1 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/56014cbf/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java index 73dc26f..1ab95a0 100755 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java @@ -57,6 +57,7 @@ import org.apache.wicket.request.UrlEncoder; import org.apache.wicket.util.file.File; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.string.StringValue; +import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.upload.FileUploadBase; import org.apache.wicket.util.value.ValueMap; import org.slf4j.Logger; @@ -1746,8 +1747,19 @@ public class MockHttpServletRequest implements HttpServletRequest */ public Url getUrl() { - String urlString = getRequestURI() + '?' + getQueryString(); - Url url = Url.parse(urlString, getCharset()); + final String urlString; + final String queryString = getQueryString(); + + if (Strings.isEmpty(queryString)) + { + urlString = getRequestURI(); + } + else + { + urlString = getRequestURI() + '?' + queryString; + } + + final Url url = Url.parse(urlString, getCharset()); url.setProtocol(scheme); url.setHost(serverName); url.setPort(serverPort);
