diff options
Diffstat (limited to 'server/src/com/vaadin')
| -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) { |