diff options
| author | Artur Signell <artur@vaadin.com> | 2014-04-17 16:32:18 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-04-28 07:03:48 +0000 |
| commit | 9768fa59bcd056ca6644f01e61eb5937d60249c3 (patch) | |
| tree | 28e52f8086c17972a83de23a24579efd3584c14b /server/src | |
| parent | c8bc4d754c71edca898a0a29302169d07d78b2ab (diff) | |
| download | vaadin-framework-9768fa59bcd056ca6644f01e61eb5937d60249c3.tar.gz vaadin-framework-9768fa59bcd056ca6644f01e61eb5937d60249c3.zip | |
Ensure session is set before writing timeout interval (#13617)
Change-Id: I4a4f85fe400b9d6e60b81fd5c6c8dbc3b3eac02c
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/com/vaadin/server/communication/MetadataWriter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/server/communication/MetadataWriter.java b/server/src/com/vaadin/server/communication/MetadataWriter.java index 5ad7186c24..bae06f5763 100644 --- a/server/src/com/vaadin/server/communication/MetadataWriter.java +++ b/server/src/com/vaadin/server/communication/MetadataWriter.java @@ -77,7 +77,8 @@ public class MetadataWriter implements Serializable { // sessionExpiredURL after timer expires. if (messages != null && messages.getSessionExpiredMessage() == null && messages.getSessionExpiredCaption() == null - && messages.isSessionExpiredNotificationEnabled()) { + && messages.isSessionExpiredNotificationEnabled() + && ui.getSession().getSession() != null) { int newTimeoutInterval = ui.getSession().getSession() .getMaxInactiveInterval(); if (repaintAll || (timeoutInterval != newTimeoutInterval)) { |