Repository: wicket Updated Branches: refs/heads/master abf1ae634 -> 44a20c5df
WICKET-6347 renderer might be null if #newEditor() doesn't create AbstractChoice, the renderer might actually be null Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/44a20c5d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/44a20c5d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/44a20c5d Branch: refs/heads/master Commit: 44a20c5df85e636a49f62c87be7377b44e5008ee Parents: 775c40c Author: Sven Meier <svenme...@apache.org> Authored: Mon Mar 27 18:38:00 2017 +0200 Committer: Sven Meier <svenme...@apache.org> Committed: Mon Apr 3 17:57:08 2017 +0200 ---------------------------------------------------------------------- .../extensions/ajax/markup/html/AjaxEditableChoiceLabel.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/44a20c5d/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java index 221a42f..5dfa693 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java @@ -325,8 +325,11 @@ public class AjaxEditableChoiceLabel<T> extends AjaxEditableLabel<T> choices.detach(); } - renderer.detach(); + if (renderer != null) + { + renderer.detach(); + } super.onDetach(); } -} +} \ No newline at end of file
