Simplified fix for #8694

svn changeset:23647/svn branch:6.8

1 files changed, 4 insertions, 6 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 04ea423004..b177cc5629 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -401,10 +401,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
     @Override
     protected void service(HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException {
-        RequestTimer.RequestWrapper wrappedRequest = new RequestTimer.RequestWrapper(
-                request);
-        RequestTimer requestTimer = RequestTimer.get(wrappedRequest);
-        requestTimer.start(wrappedRequest);
+        RequestTimer requestTimer = new RequestTimer();
+        requestTimer.start();
 
         RequestType requestType = getRequestType(request);
         if (!ensureCookiesEnabled(requestType, request, response)) {
@@ -553,8 +551,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                             request, response);
                 }
 
-                requestTimer.stop();
-                RequestTimer.set(wrappedRequest, requestTimer);
+                requestTimer.stop((AbstractWebApplicationContext) application
+                        .getContext());
             }
 
         }