Repository: wicket Updated Branches: refs/heads/wicket-6.x bffd084c9 -> b88977e22
WICKET-5893 CookieUtils should use the original response when saving a cookie Fallback to the original response only if the current one is not WebResponse. This way the buffering (BufferedWebResponse) is preserved if possible (cherry picked from commit 80e1dbbc49101508d0eae0090fd3aa3d427e3c97) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b88977e2 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b88977e2 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b88977e2 Branch: refs/heads/wicket-6.x Commit: b88977e225a070ebdce6872547702264cfa4b447 Parents: bffd084 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Apr 24 16:04:58 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Apr 24 16:07:21 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/wicket/util/cookies/CookieUtils.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b88977e2/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java b/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java index beb7b32..c4a9fcd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/cookies/CookieUtils.java @@ -20,6 +20,7 @@ import javax.servlet.http.Cookie; import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.protocol.http.servlet.ServletWebRequest; +import org.apache.wicket.request.Response; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.http.WebRequest; import org.apache.wicket.request.http.WebResponse; @@ -359,7 +360,13 @@ public class CookieUtils */ private WebResponse getWebResponse() { - return (WebResponse)RequestCycle.get().getOriginalResponse(); + RequestCycle cycle = RequestCycle.get(); + Response response = cycle.getResponse(); + if (!(response instanceof WebResponse)) + { + response = cycle.getOriginalResponse(); + } + return (WebResponse)response; } /**
