aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpag <gabi.antal88@gmail.com>2015-10-10 19:17:50 +0200
committerJohannes Dahlström <johannesd@vaadin.com>2015-11-04 13:40:09 +0200
commitcf827e6954a64b1013393d37f62ce71d3a4bfb88 (patch)
tree06cb1d9fdf29483f185e473010868e9479c9d632
parent526cce9238eb2c0e3be1e8761f7c9c807e862988 (diff)
downloadvaadin-framework-cf827e6954a64b1013393d37f62ce71d3a4bfb88.tar.gz
vaadin-framework-cf827e6954a64b1013393d37f62ce71d3a4bfb88.zip
Null pointer Exception in Slot.onBrowserEvent (#16587)
Change-Id: I60f68cf7a9e61980809af253bb4f4a0ab92f1230
-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 b97cf73989..2a92693a41 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
@@ -741,7 +741,7 @@ public final 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();