From: Leif Åstrand <leif@vaadin.com>
Date: Mon, 2 Jan 2012 13:13:25 +0000 (+0200)
Subject: Move invocation of incrementActiveRequests based on review (#8190)
X-Git-Tag: 7.0.0.alpha2~541^2~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=23aa194c32ef713f2c775163fa424eafe1f9f6e2;p=vaadin-framework.git

Move invocation of incrementActiveRequests based on review (#8190)
---

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 109f63964f..0b50c11597 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -199,6 +199,9 @@ public class ApplicationConnection {
             // inital UIDL not in DOM, request later
             repaintAll();
         } else {
+            // Update counter so TestBench knows something is still going on
+            incrementActiveRequests();
+
             // initial UIDL provided in DOM, continue as if returned by request
             handleJSONText(jsonText);
         }
@@ -622,9 +625,6 @@ public class ApplicationConnection {
             cssWaits++;
         } else {
             cssLoaded = true;
-
-            // Update counter so TestBench knows something is going on
-            incrementActiveRequests();
             handleReceivedJSONMessage(new Date(), jsonText, json);
             if (cssWaits >= MAX_CSS_WAITS) {
                 VConsole.error("CSS files may have not loaded properly.");