Use updated CurrentInstance API (#9945)

Change-Id: I6576c4be4d6c909ce95e8b48904529477ae755f9

1 files changed, 3 insertions, 4 deletions

diff --git a/server/src/com/vaadin/server/ConnectorResourceHandler.java b/server/src/com/vaadin/server/ConnectorResourceHandler.java
index 61631c3d23..12c6df6ffa 100644
--- a/server/src/com/vaadin/server/ConnectorResourceHandler.java
+++ b/server/src/com/vaadin/server/ConnectorResourceHandler.java
@@ -16,7 +16,6 @@
 package com.vaadin.server;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -76,8 +75,8 @@ public class ConnectorResourceHandler implements RequestHandler {
                 session.unlock();
             }
 
-            Map<Class<?>, Object> oldThreadLocals = new HashMap<Class<?>, Object>();
-            CurrentInstance.setThreadLocals(ui, oldThreadLocals);
+            Map<Class<?>, CurrentInstance> oldThreadLocals = CurrentInstance
+                    .setThreadLocals(ui);
             try {
                 if (!connector.handleConnectorRequest(request, response, key)) {
                     return error(request, response,
@@ -87,7 +86,7 @@ public class ConnectorResourceHandler implements RequestHandler {
                                     + key);
                 }
             } finally {
-                CurrentInstance.setThreadLocals(oldThreadLocals);
+                CurrentInstance.restoreThreadLocals(oldThreadLocals);
             }
 
             return true;