From 808297cb940524d7629751be7f347b751a0e97b6 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 28 Sep 2015 13:05:11 +0300
Subject: Create ConnectionStateHandler instance to enable overriding (#19017)

Change-Id: Idef9f42d4db109f236bc7b5e756c9e7441a618fc
---
 client/src/com/vaadin/Vaadin.gwt.xml                    | 6 ++++++
 client/src/com/vaadin/client/ApplicationConnection.java | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'client')

diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml
index 1bbece6bd6..35b225560e 100644
--- a/client/src/com/vaadin/Vaadin.gwt.xml
+++ b/client/src/com/vaadin/Vaadin.gwt.xml
@@ -80,6 +80,12 @@
         <when-property-is value="ie10" name="user.agent" />
     </replace-with>
 
+    <replace-with
+        class="com.vaadin.client.communication.DefaultConnectionStateHandler">
+        <when-type-is
+            class="com.vaadin.client.communication.ConnectionStateHandler" />
+    </replace-with>
+
     <!-- Make Sass linking available -->
     <define-linker name="sass"
         class="com.vaadin.sass.linker.SassLinker" />
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 1ae52d71fc..3efb13b632 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -45,7 +45,6 @@ import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
 import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
 import com.vaadin.client.ResourceLoader.ResourceLoadListener;
 import com.vaadin.client.communication.ConnectionStateHandler;
-import com.vaadin.client.communication.DefaultConnectionStateHandler;
 import com.vaadin.client.communication.Heartbeat;
 import com.vaadin.client.communication.MessageHandler;
 import com.vaadin.client.communication.MessageSender;
@@ -360,8 +359,7 @@ public class ApplicationConnection implements HasHandlers {
         tooltip = GWT.create(VTooltip.class);
         loadingIndicator = GWT.create(VLoadingIndicator.class);
         serverRpcQueue = GWT.create(ServerRpcQueue.class);
-        connectionStateHandler = GWT
-                .create(DefaultConnectionStateHandler.class);
+        connectionStateHandler = GWT.create(ConnectionStateHandler.class);
         messageHandler = GWT.create(MessageHandler.class);
         messageSender = GWT.create(MessageSender.class);
     }
-- 
cgit v1.2.3