diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-11-28 07:26:04 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-28 07:26:04 +0000 |
| commit | ea6d4c78b2d58bbfab2add0f4c029fbd01c81b6b (patch) | |
| tree | 4220680700eb8b7322a4dff8b739531a78122314 | |
| parent | d7fa318bfd22f4274bec57d09bb74d98e458fc1a (diff) | |
| parent | 679b2671978ff132dab0d1dcc2b73be32afd4039 (diff) | |
| download | vaadin-framework-ea6d4c78b2d58bbfab2add0f4c029fbd01c81b6b.tar.gz vaadin-framework-ea6d4c78b2d58bbfab2add0f4c029fbd01c81b6b.zip | |
Merge "Fixed NPE when timer fires before updateFromUidl (#10400)"
| -rw-r--r-- | client/src/com/vaadin/client/ui/VUI.java | 6 |
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); |