Repository: wicket Updated Branches: refs/heads/wicket-6.x 20e3acce7 -> 319a6b860
WICKET-1718 since 1.5.x a ReplaceHandlerException does no longer immediately change the current request handler, thus the comparison with the current page was bogus and never prevented validation of headers Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d3a2156e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d3a2156e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d3a2156e Branch: refs/heads/wicket-6.x Commit: d3a2156e646a2328071b05b7f94ce6a45024513d Parents: 20e3acc Author: Sven Meier <[email protected]> Authored: Sat Jul 25 23:17:54 2015 +0200 Committer: Sven Meier <[email protected]> Committed: Sat Jul 25 23:46:52 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/markup/html/WebPage.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d3a2156e/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java index 5519920..c90ee73 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java @@ -213,23 +213,13 @@ public class WebPage extends Page @Override protected void onAfterRender() { - super.onAfterRender(); - // only in development mode validate the headers if (getApplication().usesDevelopmentConfig()) { - // Ignore if an exception and a redirect happened in between (e.g. - // RestartResponseAtInterceptPageException) - IRequestHandler activeHandler = getRequestCycle().getActiveRequestHandler(); - if (activeHandler instanceof IPageRequestHandler) - { - IPageRequestHandler h = (IPageRequestHandler)activeHandler; - if (h.getPage() == this) - { - validateHeaders(); - } - } + validateHeaders(); } + + super.onAfterRender(); } /**
