From 24c6da9ee5c5a7c464a7f3aa849356eb9885cead Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 3 Jun 2015 11:30:06 +0300
Subject: Reset heartbeat timestamp when reopening UI (#18101)

Change-Id: I288bae95e364277819727a99854d94fbbc98b162
---
 server/src/com/vaadin/ui/UI.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'server')

diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index b16d7e32d3..2129db614b 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -718,6 +718,9 @@ public abstract class UI extends AbstractSingleComponentContainer implements
 
         page.init(request);
 
+        // Reset heartbeat timeout to avoid surprise if it's almost expired
+        setLastHeartbeatTimestamp(System.currentTimeMillis());
+
         refresh(request);
 
         URI newLocation = page.getLocation();
-- 
cgit v1.2.3