From 26b5b672df0aa3bdefdced81ed4619c11f3e945a Mon Sep 17 00:00:00 2001
From: Henrik Paul <henrik@vaadin.com>
Date: Tue, 26 Nov 2013 14:49:12 +0200
Subject: Timeout redirect timer is reset on server activity (#12446)

Change-Id: Iec2e3de627bc1cf5c7d39bf98715b1bf343e7519
---
 client/src/com/vaadin/client/ApplicationConnection.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'client')

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() {
-- 
cgit v1.2.3