diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2013-05-02 13:58:36 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-05-02 11:29:34 +0000 |
| commit | 087756f1a6472af100686fdfebd7aa273faa0059 (patch) | |
| tree | 8c41ff45042663b0865f9aef24303d4f7dcec53e /server/src | |
| parent | 79e9ddc5247ae154d5f63ceeeb02afb293dbc91f (diff) | |
| download | vaadin-framework-087756f1a6472af100686fdfebd7aa273faa0059.tar.gz vaadin-framework-087756f1a6472af100686fdfebd7aa273faa0059.zip | |
Allow setting push mode in UI.init (#11739)
Change-Id: Ied24bc42a25800033351fcbacdc5fc5e0be8eda1
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/com/vaadin/server/communication/UIInitHandler.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/src/com/vaadin/server/communication/UIInitHandler.java b/server/src/com/vaadin/server/communication/UIInitHandler.java index 97aaa6bd74..e4b5360b49 100644 --- a/server/src/com/vaadin/server/communication/UIInitHandler.java +++ b/server/src/com/vaadin/server/communication/UIInitHandler.java @@ -204,11 +204,6 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler { ui.setSession(session); } - // Set thread local here so it is available in init - UI.setCurrent(ui); - - ui.doInit(request, uiId.intValue()); - PushMode pushMode = provider.getPushMode(event); if (pushMode == null) { pushMode = session.getService().getDeploymentConfiguration() @@ -216,6 +211,11 @@ public abstract class UIInitHandler extends SynchronizedRequestHandler { } ui.setPushMode(pushMode); + // Set thread local here so it is available in init + UI.setCurrent(ui); + + ui.doInit(request, uiId.intValue()); + session.addUI(ui); // Remember if it should be remembered |