summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-02-21 00:41:24 +0200
committerVaadin Code Review <review@vaadin.com>2015-02-23 20:43:34 +0000
commit06a7d69c88157e41a8420f4c77efb91a7e1ad997 (patch)
treed8339529497352ce269795f1e57e5f91f00dd8e7 /server
parent7a05a85dd10d2ca61c222943d5b1bc9963fd4987 (diff)
downloadvaadin-framework-06a7d69c88157e41a8420f4c77efb91a7e1ad997.tar.gz
vaadin-framework-06a7d69c88157e41a8420f4c77efb91a7e1ad997.zip
Cleanup UI even if detach fails (#16651)
Change-Id: Iefc27b7047836243268970605ba2e946fac55e95
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/ui/UI.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 66f893e04a..8dd600ddd0 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -425,7 +425,12 @@ public abstract class UI extends AbstractSingleComponentContainer implements
+ ".");
} else {
if (session == null) {
- detach();
+ try {
+ detach();
+ } catch (Exception e) {
+ getLogger().log(Level.WARNING,
+ "Error while detaching UI from session", e);
+ }
// Disable push when the UI is detached. Otherwise the
// push connection and possibly VaadinSession will live on.
getPushConfiguration().setPushMode(PushMode.DISABLED);