diff options
| author | Artur Signell <artur@vaadin.com> | 2013-11-04 11:25:50 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-11-04 09:39:53 +0000 |
| commit | f328340116059d984431ff78b6c8cd26be8abf98 (patch) | |
| tree | b1de911c5a09f27be7ae9c0d7d4d63ab5a2a67db /client | |
| parent | c48c94dc23da22b6d885c69b0bc697257f9dbf11 (diff) | |
| download | vaadin-framework-f328340116059d984431ff78b6c8cd26be8abf98.tar.gz vaadin-framework-f328340116059d984431ff78b6c8cd26be8abf98.zip | |
Fix NPE caused by setting ApplicationConnection too late (#12736)
Change-Id: Ib5b3bc7123ffd2f212fb6e242ee07175ff743b0f
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/window/WindowConnector.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/ui/window/WindowConnector.java b/client/src/com/vaadin/client/ui/window/WindowConnector.java index 4b839384a2..ff2e93a3b2 100644 --- a/client/src/com/vaadin/client/ui/window/WindowConnector.java +++ b/client/src/com/vaadin/client/ui/window/WindowConnector.java @@ -99,6 +99,8 @@ public class WindowConnector extends AbstractSingleComponentContainerConnector super.init(); VWindow window = getWidget(); + window.id = getConnectorId(); + window.client = getConnection(); getLayoutManager().registerDependency(this, window.contentPanel.getElement()); @@ -127,9 +129,6 @@ public class WindowConnector extends AbstractSingleComponentContainerConnector VWindow window = getWidget(); String connectorId = getConnectorId(); - window.id = getConnectorId(); - window.client = client; - // Workaround needed for Testing Tools (GWT generates window DOM // slightly different in different browsers). window.closeBox.setId(connectorId + "_window_close"); |