]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fixed NPE when timer fires before updateFromUidl (#10400) 06/406/1
authorArtur Signell <artur@vaadin.com>
Tue, 27 Nov 2012 14:51:05 +0000 (16:51 +0200)
committerArtur Signell <artur@vaadin.com>
Tue, 27 Nov 2012 14:51:05 +0000 (16:51 +0200)
Change-Id: Ib4be170a2e824e9e9623160ed09f585c92295323

client/src/com/vaadin/client/ui/VUI.java

index 577af47aae6a21dd74bb3d6451e39be2040b0de6..688c60bca10a0361a8056bf4ddf62dee1d885b40 100644 (file)
@@ -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);