summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-06 20:24:24 +0300
committerArtur Signell <artur@vaadin.com>2015-09-06 17:37:22 +0000
commitc8f92cd539d08962ed324ff2e7322aa8dfac2124 (patch)
tree94b306109f32ca17e18b1fa2cf7cfe9838bb1c98
parent95c5064f0984c2a35443a8ef74e0e1f045569b95 (diff)
downloadvaadin-framework-c8f92cd539d08962ed324ff2e7322aa8dfac2124.tar.gz
vaadin-framework-c8f92cd539d08962ed324ff2e7322aa8dfac2124.zip
Ensure dialog is not shown if reconnected during grace period (#11733)
Change-Id: Ic94ebc1a8758826ab515bfd883c02f4953836832
-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");