diff options
| author | Henrik Paul <henrik@vaadin.com> | 2013-11-26 14:49:12 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-12-03 13:35:56 +0000 |
| commit | 26b5b672df0aa3bdefdced81ed4619c11f3e945a (patch) | |
| tree | 2a82389c617d0ba8715a695f3aa95b143c73cb5d /client | |
| parent | 25fc48c52067237faa208cea849a775a7aa1668c (diff) | |
| download | vaadin-framework-26b5b672df0aa3bdefdced81ed4619c11f3e945a.tar.gz vaadin-framework-26b5b672df0aa3bdefdced81ed4619c11f3e945a.zip | |
Timeout redirect timer is reset on server activity (#12446)
Change-Id: Iec2e3de627bc1cf5c7d39bf98715b1bf343e7519
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ApplicationConnection.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java index f95cec4fbc..a87fa3e342 100644 --- a/client/src/com/vaadin/client/ApplicationConnection.java +++ b/client/src/com/vaadin/client/ApplicationConnection.java @@ -64,7 +64,6 @@ import com.google.gwt.user.client.Window.ClosingHandler; import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ApplicationConfiguration.ErrorMessage; -import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent; import com.vaadin.client.ResourceLoader.ResourceLoadEvent; import com.vaadin.client.ResourceLoader.ResourceLoadListener; import com.vaadin.client.communication.HasJavaScriptConnectorHelper; @@ -1417,6 +1416,9 @@ public class ApplicationConnection { if (meta.containsKey("timedRedirect")) { final ValueMap timedRedirect = meta .getValueMap("timedRedirect"); + if (redirectTimer != null) { + redirectTimer.cancel(); + } redirectTimer = new Timer() { @Override public void run() { |