From 6539cb439f36c77aaa9cb80e6e0fc683f145a060 Mon Sep 17 00:00:00 2001 From: pag Date: Sat, 10 Oct 2015 17:05:37 +0200 Subject: VTree$TreeNode avoid NPE triggered by external ONLOAD events (#18563) If an ONLOAD event fires but the target is not the icon, an NPE occurs. The isCaptionElement method has already used the check against null before any call happens on the icon which logic is enough for the onBrowserEvent check as well. Change-Id: I64de45a07f50f113dcfcb4556f0d8adeea9e1b1b --- client/src/com/vaadin/client/ui/VTree.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/com/vaadin/client/ui/VTree.java b/client/src/com/vaadin/client/ui/VTree.java index 8fcb01e5d5..efbafd0cb7 100644 --- a/client/src/com/vaadin/client/ui/VTree.java +++ b/client/src/com/vaadin/client/ui/VTree.java @@ -710,7 +710,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, final int type = DOM.eventGetType(event); final Element target = DOM.eventGetTarget(event); - if (type == Event.ONLOAD && target == icon.getElement()) { + if (type == Event.ONLOAD && icon != null && target == icon.getElement()) { iconLoaded.trigger(); } -- cgit v1.2.3