Repository: wicket Updated Branches: refs/heads/wicket-6.x 89a2aac8c -> 664424a61
WICKET-6246 backport change from WICKET-6162 replace original header container Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/664424a6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/664424a6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/664424a6 Branch: refs/heads/wicket-6.x Commit: 664424a612c337ec200b276e0ec710fdd40b6ebc Parents: 89a2aac Author: Sven Meier <svenme...@apache.org> Authored: Tue Sep 20 14:58:30 2016 +0200 Committer: Sven Meier <svenme...@apache.org> Committed: Tue Sep 20 14:58:40 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/ajax/AbstractAjaxResponse.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/664424a6/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java index b3299fb..248178e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxResponse.java @@ -106,6 +106,8 @@ public abstract class AbstractAjaxResponse protected HtmlHeaderContainer header = null; + private Component originalHeaderContainer = null; + // whether a header contribution is being rendered private boolean headerRendering = false; @@ -125,6 +127,7 @@ public abstract class AbstractAjaxResponse public AbstractAjaxResponse(final Page page) { this.page = page; + this.originalHeaderContainer = page.get(HtmlHeaderSectionHandler.HEADER_ID); WebResponse response = (WebResponse) page.getResponse(); encodingBodyResponse = new AjaxResponse(response); @@ -165,9 +168,9 @@ public abstract class AbstractAjaxResponse writeFooter(response, encoding); } finally { - if (header != null) { + if (header != null && originalHeaderContainer!= null) { // restore a normal header - page.replace(new HtmlHeaderContainer(HtmlHeaderSectionHandler.HEADER_ID)); + page.replace(originalHeaderContainer); header = null; } }
