1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 799271b979..6ab2748332 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -400,12 +400,12 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
     private void service(WrappedHttpServletRequest request,
             WrappedHttpServletResponse response) throws ServletException,
             IOException {
+        RequestTimer requestTimer = new RequestTimer();
+        requestTimer.start();
+
         AbstractApplicationServletWrapper servletWrapper = new AbstractApplicationServletWrapper(
                 this);
 
-        RequestTimer requestTimer = RequestTimer.get(request);
-        requestTimer.start(request);
-
         RequestType requestType = getRequestType(request);
         if (!ensureCookiesEnabled(requestType, request, response)) {
             return;
@@ -540,10 +540,11 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                 } finally {
                     Root.setCurrentRoot(null);
                     Application.setCurrentApplication(null);
-                }
 
-                requestTimer.stop();
-                RequestTimer.set(request, requestTimer);
+                    requestTimer
+                            .stop((AbstractWebApplicationContext) application
+                                    .getContext());
+                }
             }
 
         }