Bladeren bron

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
tags/7.6.0.beta1
pag 8 jaren geleden
bovenliggende
commit
6539cb439f
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1
    1
      client/src/com/vaadin/client/ui/VTree.java

+ 1
- 1
client/src/com/vaadin/client/ui/VTree.java Bestand weergeven

@@ -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();
}


Laden…
Annuleren
Opslaan