Ensure dialog is not shown if reconnected during grace period (#11733)

Change-Id: Ic94ebc1a8758826ab515bfd883c02f4953836832

diff --git a/client/src/com/vaadin/client/communication/DefaultConnectionStateHandler.java b/client/src/com/vaadin/client/communication/DefaultConnectionStateHandler.java
index 9d4ea6e1128ee99550ebb85fe55e8b940dff8d5e..03fa436a572827da1efd06d96be61c6b8d881a85 100644 (file)
--- 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");