summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2013-04-26 12:25:51 +0300
committerJohn Ahlroos <john@vaadin.com>2013-04-26 12:25:51 +0300
commitedf91cb9ecc9eeb74efa49662bc3bf00a86c3bb2 (patch)
treed493c4acad636731ee8ac972e77e931142420c57 /client
parent38c509fec8cd934512f433ea4b7f7781430c8d08 (diff)
downloadvaadin-framework-edf91cb9ecc9eeb74efa49662bc3bf00a86c3bb2.tar.gz
vaadin-framework-edf91cb9ecc9eeb74efa49662bc3bf00a86c3bb2.zip
Fixed NPE regression after fix for #11693
Change-Id: I8c9cf686d0746d790a1d55d66a75497fb627714c
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/orderedlayout/Slot.java5
1 files changed, 4 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 4fb5acf287..5fab131c65 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
@@ -104,7 +104,10 @@ public final class Slot extends SimplePanel {
@Override
public void onElementResize(ElementResizeEvent e) {
- Util.forceIE8Redraw(getCaptionElement());
+ Element caption = getCaptionElement();
+ if (caption != null) {
+ Util.forceIE8Redraw(caption);
+ }
}
};