Repository: wicket Updated Branches: refs/heads/master 9716f2a7e -> 1d64d4ccf
WICKET-5731 Using "Submit" button in Ajax DropDownChoice example leads to broken HTML page Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d64d4cc Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d64d4cc Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d64d4cc Branch: refs/heads/master Commit: 1d64d4ccfa9d1114986594ffd8f68cb6e41c09bc Parents: 9716f2a Author: Andrea Del Bene <[email protected]> Authored: Tue Oct 21 12:22:25 2014 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Tue Oct 21 12:22:25 2014 +0200 ---------------------------------------------------------------------- .../apache/wicket/ajax/AbstractAjaxResponse.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1d64d4cc/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 64900b2..c0f3c34 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 @@ -497,7 +497,7 @@ public abstract class AbstractAjaxResponse { private static final long serialVersionUID = 1L; - private final transient AbstractAjaxResponse ajaxResponse; + private transient AbstractAjaxResponse ajaxResponse; /** * Constructor. @@ -518,7 +518,19 @@ public abstract class AbstractAjaxResponse @Override protected IHeaderResponse newHeaderResponse() { - return ajaxResponse.getHeaderResponse(); + if (ajaxResponse != null) + { + return ajaxResponse.getHeaderResponse(); + } + + return super.newHeaderResponse(); + } + + @Override + protected void onDetach() + { + super.onDetach(); + ajaxResponse = null; } }
