From 06a7d69c88157e41a8420f4c77efb91a7e1ad997 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Sat, 21 Feb 2015 00:41:24 +0200
Subject: Cleanup UI even if detach fails (#16651)

Change-Id: Iefc27b7047836243268970605ba2e946fac55e95
---
 server/src/com/vaadin/ui/UI.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'server')

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