summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/UI.java
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-05-28 15:39:02 +0300
committerLeif Åstrand <leif@vaadin.com>2013-05-28 15:39:02 +0300
commitd34583895c884767537ad866de942d23c044af52 (patch)
tree5d3e693f3b0dfb2b12c7e337518e795f3d5bd7af /server/src/com/vaadin/ui/UI.java
parent2b5ba963af81bb8a21f51ab29bd47ecd0054daa6 (diff)
downloadvaadin-framework-d34583895c884767537ad866de942d23c044af52.tar.gz
vaadin-framework-d34583895c884767537ad866de942d23c044af52.zip
Remove ThreadLocal references from CurrentInstance (#11914)
Change-Id: Ic7389a06726026383b96de80b0d038ed11e9d273
Diffstat (limited to 'server/src/com/vaadin/ui/UI.java')
-rw-r--r--server/src/com/vaadin/ui/UI.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 0b21112c97..508564ac0f 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -1157,12 +1157,12 @@ public abstract class UI extends AbstractSingleComponentContainer implements
// acquired the lock.
throw new UIDetachedException();
}
- old = CurrentInstance.setThreadLocals(this);
+ old = CurrentInstance.setCurrent(this);
runnable.run();
} finally {
session.unlock();
if (old != null) {
- CurrentInstance.restoreThreadLocals(old);
+ CurrentInstance.restoreInstances(old);
}
}