diff options
| author | Artur Signell <artur@vaadin.com> | 2012-03-19 15:23:47 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-03-21 15:27:44 +0200 |
| commit | 9a5dbba61009caf7d011a1b9d024a9806bdb50c2 (patch) | |
| tree | bb32db4d379672956e31f9dabd20c0ea209c2429 /src/com/vaadin/Application.java | |
| parent | 3a234a45f5ec1d019fb0c9e93a19f8f065e0ee6f (diff) | |
| download | vaadin-framework-9a5dbba61009caf7d011a1b9d024a9806bdb50c2.tar.gz vaadin-framework-9a5dbba61009caf7d011a1b9d024a9806bdb50c2.zip | |
#8455 Root.getCurrentRoot can now be used in Root.init()
Diffstat (limited to 'src/com/vaadin/Application.java')
| -rw-r--r-- | src/com/vaadin/Application.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java index fdb7de0454..4d29654fef 100644 --- a/src/com/vaadin/Application.java +++ b/src/com/vaadin/Application.java @@ -2155,6 +2155,9 @@ public class Application implements Terminal.ErrorListener, Serializable { } } + // Set thread local here so it is available in init + Root.setCurrentRoot(root); + if (!initedRoots.contains(rootId)) { boolean initRequiresBrowserDetails = isRootPreserved() || !root.getClass() @@ -2176,7 +2179,6 @@ public class Application implements Terminal.ErrorListener, Serializable { } } // end synchronized block - Root.setCurrentRoot(root); return root; } |