From c8f92cd539d08962ed324ff2e7322aa8dfac2124 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Sun, 6 Sep 2015 20:24:24 +0300
Subject: Ensure dialog is not shown if reconnected during grace period
 (#11733)

Change-Id: Ic94ebc1a8758826ab515bfd883c02f4953836832
---
 .../com/vaadin/client/communication/DefaultConnectionStateHandler.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/src/com/vaadin/client/communication/DefaultConnectionStateHandler.java b/client/src/com/vaadin/client/communication/DefaultConnectionStateHandler.java
index 9d4ea6e112..03fa436a57 100644
--- a/client/src/com/vaadin/client/communication/DefaultConnectionStateHandler.java
+++ b/client/src/com/vaadin/client/communication/DefaultConnectionStateHandler.java
@@ -522,6 +522,9 @@ public class DefaultConnectionStateHandler implements ConnectionStateHandler {
 
         reconnectionCause = null;
         reconnectAttempt = 0;
+        // IF reconnect happens during grace period, make sure the dialog is not
+        // shown and does not popup later
+        stopDialogTimer();
         hideDialog();
 
         getLogger().info("Re-established connection to server");
-- 
cgit v1.2.3