Make sure the request timer is always stopped, better names #8694

svn changeset:23648/svn branch:6.8

4 files changed, 27 insertions, 22 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index de7ad83b54..dcf52827ed 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -237,7 +237,7 @@ public class ApplicationConnection {
         	    ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::lastProcessingTime,
                     ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::totalProcessingTime
     	        ];
-    	    pd = pd.concat(ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::testBenchServerStatus);
+    	    pd = pd.concat(ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::serverTimingInfo);
     	    return pd;
     	});
 
@@ -668,7 +668,7 @@ public class ApplicationConnection {
      * servicing the session so far. These values are always one request behind,
      * since they cannot be measured before the request is finished.
      */
-    private ValueMap testBenchServerStatus;
+    private ValueMap serverTimingInfo;
 
     static final int MAX_CSS_WAITS = 100;
 
@@ -991,10 +991,10 @@ public class ApplicationConnection {
         }
 
         /*
-         * Hook for TestBench to get details about server status
+         * Hook for e.g. TestBench to get details about server peformance
          */
-        if (json.containsKey("tbss")) {
-            testBenchServerStatus = json.getValueMap("tbss");
+        if (json.containsKey("timings")) {
+            serverTimingInfo = json.getValueMap("timings");
         }
 
         Command c = new Command() {
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
index a9364c3cf7..1741ec5e7f 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
@@ -488,15 +488,17 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
                                 .endTransaction(application, request);
                     }
                 } finally {
-                    if (requestStarted) {
-                        ((PortletRequestListener) application).onRequestEnd(
-                                request, response);
+                    try {
+                        if (requestStarted) {
+                            ((PortletRequestListener) application)
+                                    .onRequestEnd(request, response);
 
+                        }
+                    } finally {
+                        requestTimer
+                                .stop((AbstractWebApplicationContext) application
+                                        .getContext());
                     }
-
-                    requestTimer
-                            .stop((AbstractWebApplicationContext) application
-                                    .getContext());
                 }
             }
         }
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index b177cc5629..d42b2142fe 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -546,13 +546,16 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                 }
 
             } finally {
-                if (requestStarted) {
-                    ((HttpServletRequestListener) application).onRequestEnd(
-                            request, response);
+                try {
+                    if (requestStarted) {
+                        ((HttpServletRequestListener) application)
+                                .onRequestEnd(request, response);
+                    }
+                } finally {
+                    requestTimer
+                            .stop((AbstractWebApplicationContext) application
+                                    .getContext());
                 }
-
-                requestTimer.stop((AbstractWebApplicationContext) application
-                        .getContext());
             }
 
         }
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index be1b829eb4..cb570f88e7 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1206,17 +1206,17 @@ public abstract class AbstractCommunicationManager implements
             dragAndDropService.printJSONResponse(outWriter);
         }
 
-        writePerformanceDataForTestBench(outWriter);
+        writePerformanceData(outWriter);
     }
 
     /**
-     * Adds the performance timing data used by TestBench 3 to the UIDL
+     * Adds the performance timing data (used by TestBench 3) to the UIDL
      * response.
      */
-    private void writePerformanceDataForTestBench(final PrintWriter outWriter) {
+    private void writePerformanceData(final PrintWriter outWriter) {
         AbstractWebApplicationContext ctx = (AbstractWebApplicationContext) application
                 .getContext();
-        outWriter.write(String.format(", \"tbss\":[%d, %d]",
+        outWriter.write(String.format(", \"timings\":[%d, %d]",
                 ctx.getTotalSessionTime(), ctx.getLastRequestTime()));
     }