summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorpag <gabi.antal88@gmail.com>2015-10-10 19:17:50 +0200
committerpag <gabi.antal88@gmail.com>2015-10-29 22:21:10 +0100
commit731fec8cc81c4ff6ca53d404b68a2c1538fd3885 (patch)
treef567a87f9c5e309a3555fbb86f7f697bc3afb412 /client
parent6ed91a94302900e89b1de9b54d0561701af49a0c (diff)
downloadvaadin-framework-731fec8cc81c4ff6ca53d404b68a2c1538fd3885.tar.gz
vaadin-framework-731fec8cc81c4ff6ca53d404b68a2c1538fd3885.zip
Null pointer Exception in Slot.onBrowserEvent (#16587)
Change-Id: I60f68cf7a9e61980809af253bb4f4a0ab92f1230
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/orderedlayout/Slot.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
index cc4b6a0662..564c15472f 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
@@ -772,7 +772,7 @@ public class Slot extends SimplePanel {
@Override
public void onBrowserEvent(Event event) {
super.onBrowserEvent(event);
- if (DOM.eventGetType(event) == Event.ONLOAD
+ if (DOM.eventGetType(event) == Event.ONLOAD && icon != null
&& icon.getElement() == DOM.eventGetTarget(event)) {
if (layout.getLayoutManager() != null) {
layout.getLayoutManager().layoutLater();