diff options
| author | Leif Åstrand <leif@vaadin.com> | 2015-04-23 15:54:29 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-04-24 07:38:28 +0000 |
| commit | 8be56ef580e4fab732060d7d99f560c9917ca502 (patch) | |
| tree | 8057cf98330a16cf4b41af745e8f01e1bc789b4a /server/src/com/vaadin/util | |
| parent | 7572ef713e218f29ca316652f13cf6eef88d1c0b (diff) | |
| download | vaadin-framework-8be56ef580e4fab732060d7d99f560c9917ca502.tar.gz vaadin-framework-8be56ef580e4fab732060d7d99f560c9917ca502.zip | |
Make restoreInstances clear value when previous value was gc:ed (#17603)
Change-Id: I61992c04cac578dc1158efd9c76484eacc8a6b6a
Diffstat (limited to 'server/src/com/vaadin/util')
| -rw-r--r-- | server/src/com/vaadin/util/CurrentInstance.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/server/src/com/vaadin/util/CurrentInstance.java b/server/src/com/vaadin/util/CurrentInstance.java index d11fa175ac..e6b58ec65c 100644 --- a/server/src/com/vaadin/util/CurrentInstance.java +++ b/server/src/com/vaadin/util/CurrentInstance.java @@ -260,10 +260,9 @@ public class CurrentInstance implements Serializable { * unless it respects null values, will just leave the wrong UI * instance registered. */ - set(c, null, ci.inheritable); - } else { - set(c, v, ci.inheritable); + v = null; } + set(c, v, ci.inheritable); } if (removeStale) { |