#8190 Recorder no longer waits for Vaadin application to load

diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index f8eedb8fd1395bb373cb4b7ee32742751830953c..6adcb86c99c01065d1c82c4bb0b7cd74160a6acf 100644 (file)
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -72,6 +72,14 @@
                                throw "Application " + appId + " already initialized";
                        }
                        log("init application", appId, config);
+                       
+                       var testbenchId = appId.replace(/-\d+$/, '');
+                       window.vaadin.clients[testbenchId] = {
+                                       isActive: function() {
+                                               return true;
+                                       }
+                       }
+                       
                        var getConfig = function(name) {
                                var value = config[name];
                                if (value === undefined) {
@@ -176,6 +184,7 @@
                        
                        return app;
                },
+               clients: {},
                getApp: function(appId) {
                        var app = apps[appId]; 
                        return app;

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 3816a4e933a914f4284a4ff2e464ad46a8ad7e50..109f63964f7ecf0c158e973de00d249ff5b23ad8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -227,10 +227,6 @@ public class ApplicationConnection {
                return componentLocator.@com.vaadin.terminal.gwt.client.ComponentLocator::getPathForElement(Lcom/google/gwt/user/client/Element;)(element);
        }
 
-       if (!$wnd.vaadin.clients) {
-               $wnd.vaadin.clients = {};
-       }
-
        $wnd.vaadin.clients[TTAppId] = client;
     }-*/;
 
@@ -626,6 +622,9 @@ 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.");