Updated Branches: refs/heads/master f9b120886 -> 56014cbff refs/heads/wicket-1.5.x d6b64ded2 -> f5089d880
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/f5089d88 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f5089d88 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f5089d88 Branch: refs/heads/wicket-1.5.x Commit: f5089d880f74a77bedede8a2e8fdc7564d0e41b1 Parents: d6b64de Author: Peter Ertl <p...@apache.org> Authored: Mon Feb 6 22:52:19 2012 +0100 Committer: Peter Ertl <p...@apache.org> Committed: Mon Feb 6 22:52:19 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/f5089d88/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 ad847ea..77e3ff9 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; @@ -1691,8 +1692,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);
