diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-06-15 12:40:52 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-06-15 13:25:56 +0300 |
| commit | 3065d80e1826bcacd53df1a4a214318253697272 (patch) | |
| tree | f35b28f7d577aa4fe0aefeaa76b87077b57eea44 /server/src/com/vaadin/ui/UI.java | |
| parent | 1b67d65d9718745edc69a51c082e917a2bbee2e0 (diff) | |
| parent | 684e619dd79e233ba798aa116810dd6585df3e7c (diff) | |
| download | vaadin-framework-3065d80e1826bcacd53df1a4a214318253697272.tar.gz vaadin-framework-3065d80e1826bcacd53df1a4a214318253697272.zip | |
Merge remote-tracking branch 'origin/master' into grid-unbuffered-editor
Change-Id: Iabd10ff91e7aef1f5df5435c56d3decfd4d39610
Diffstat (limited to 'server/src/com/vaadin/ui/UI.java')
| -rw-r--r-- | server/src/com/vaadin/ui/UI.java | 3 |
1 files changed, 3 insertions, 0 deletions
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(); |