summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/src/com/vaadin/client/communication/DefaultConnectionStateHandler.java3
1 files changed, 3 insertions, 0 deletions
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");