Updated Branches: refs/heads/master ff71a3812 -> 02d3e2135
WICKET-4922 Cloned ServletWebRequest returns wrong OriginalUrl Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/02d3e213 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/02d3e213 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/02d3e213 Branch: refs/heads/master Commit: 02d3e2135891cb2b9a4681278848c860ba280eab Parents: ff71a38 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Dec 12 15:11:17 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Dec 12 15:11:17 2012 +0200 ---------------------------------------------------------------------- .../protocol/http/servlet/ServletWebRequest.java | 6 ++++++ .../org/apache/wicket/request/http/WebRequest.java | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/02d3e213/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java index 8e41aef..83df540 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java @@ -422,6 +422,12 @@ public class ServletWebRequest extends WebRequest return new ServletWebRequest(httpServletRequest, filterPrefix, url) { @Override + public Url getOriginalUrl() + { + return ServletWebRequest.this.getOriginalUrl(); + } + + @Override public IRequestParameters getPostParameters() { // don't parse post parameters again http://git-wip-us.apache.org/repos/asf/wicket/blob/02d3e213/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java b/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java index 0f41ec5..ec97b34 100644 --- a/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/http/WebRequest.java @@ -154,6 +154,12 @@ public abstract class WebRequest extends Request } @Override + public Url getOriginalUrl() + { + return WebRequest.this.getOriginalUrl(); + } + + @Override public IRequestParameters getPostParameters() { return WebRequest.this.getPostParameters();
