1 files changed, 10 insertions, 11 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index 9a6bccebb8..be1b829eb4 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -912,7 +912,7 @@ public abstract class AbstractCommunicationManager implements
                 repaintAll = true;
             }
 
-            writeUidlResponse(request, callback, repaintAll, outWriter, window,
+            writeUidlResponce(callback, repaintAll, outWriter, window,
                     analyzeLayouts);
 
         }
@@ -922,9 +922,9 @@ public abstract class AbstractCommunicationManager implements
 
     }
 
-    public void writeUidlResponse(Request request, Callback callback,
-            boolean repaintAll, final PrintWriter outWriter, Window window,
-            boolean analyzeLayouts) throws PaintException {
+    public void writeUidlResponce(Callback callback, boolean repaintAll,
+            final PrintWriter outWriter, Window window, boolean analyzeLayouts)
+            throws PaintException {
         outWriter.print("\"changes\":[");
 
         ArrayList<Paintable> paintables = null;
@@ -1206,19 +1206,18 @@ public abstract class AbstractCommunicationManager implements
             dragAndDropService.printJSONResponse(outWriter);
         }
 
-        writePerformanceDataForTestBench(request, outWriter);
+        writePerformanceDataForTestBench(outWriter);
     }
 
     /**
      * Adds the performance timing data used by TestBench 3 to the UIDL
      * response.
      */
-    private void writePerformanceDataForTestBench(final Request request,
-            final PrintWriter outWriter) {
-        Long totalTime = (Long) request.getAttribute("TOTAL");
-        Long lastRequestTime = (Long) request.getAttribute("LASTREQUEST");
-        outWriter.write(String.format(", \"tbss\":[%d, %d]", totalTime,
-                lastRequestTime));
+    private void writePerformanceDataForTestBench(final PrintWriter outWriter) {
+        AbstractWebApplicationContext ctx = (AbstractWebApplicationContext) application
+                .getContext();
+        outWriter.write(String.format(", \"tbss\":[%d, %d]",
+                ctx.getTotalSessionTime(), ctx.getLastRequestTime()));
     }
 
     private int getTimeoutInterval() {