summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-11-27 16:51:05 +0200
committerArtur Signell <artur@vaadin.com>2012-11-27 16:51:05 +0200
commit679b2671978ff132dab0d1dcc2b73be32afd4039 (patch)
treedf32db2aaa01fe7eeab0401b39e26fd32bca4256
parent190500e1bb72dbaa0a8cf2de9599a99d5cc63181 (diff)
downloadvaadin-framework-679b2671978ff132dab0d1dcc2b73be32afd4039.tar.gz
vaadin-framework-679b2671978ff132dab0d1dcc2b73be32afd4039.zip
Fixed NPE when timer fires before updateFromUidl (#10400)
Change-Id: Ib4be170a2e824e9e9623160ed09f585c92295323
-rw-r--r--client/src/com/vaadin/client/ui/VUI.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/VUI.java b/client/src/com/vaadin/client/ui/VUI.java
index 577af47aae..688c60bca1 100644
--- a/client/src/com/vaadin/client/ui/VUI.java
+++ b/client/src/com/vaadin/client/ui/VUI.java
@@ -238,6 +238,12 @@ public class VUI extends SimplePanel implements ResizeHandler,
@Deprecated
protected void windowSizeMaybeChanged(int newWindowWidth,
int newWindowHeight) {
+ if (connection == null) {
+ // Connection is null if the timer fires before the first UIDL
+ // update
+ return;
+ }
+
boolean changed = false;
ComponentConnector connector = ConnectorMap.get(connection)
.getConnector(this);