summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/UI.java
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2014-04-07 15:00:49 +0300
committerVaadin Code Review <review@vaadin.com>2014-04-10 11:18:20 +0000
commit55dfd2936a1680f444be8e7357ac4ceaa6870e23 (patch)
tree67c1e78ede4ee2c4221514adf39edc442c63955f /server/src/com/vaadin/ui/UI.java
parent2067d4e01045fa4ca1d512322d6442499d6aded0 (diff)
downloadvaadin-framework-55dfd2936a1680f444be8e7357ac4ceaa6870e23.tar.gz
vaadin-framework-55dfd2936a1680f444be8e7357ac4ceaa6870e23.zip
Prevent duplicate session destroy events (#12612)
Change-Id: Ic752268a9deac350dbff29ecf73cfce2eb1ba0cc
Diffstat (limited to 'server/src/com/vaadin/ui/UI.java')
-rw-r--r--server/src/com/vaadin/ui/UI.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 2b2e773601..275aeb4c79 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -53,6 +53,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.server.VaadinService;
import com.vaadin.server.VaadinServlet;
import com.vaadin.server.VaadinSession;
+import com.vaadin.server.VaadinSession.State;
import com.vaadin.server.communication.PushConnection;
import com.vaadin.shared.Connector;
import com.vaadin.shared.EventId;
@@ -1162,7 +1163,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
public void close() {
closing = true;
- boolean sessionExpired = (session == null || session.isClosing());
+ boolean sessionExpired = (session == null || session.getState() != State.OPEN);
getRpcProxy(UIClientRpc.class).uiClosed(sessionExpired);
if (getPushConnection() != null) {
// Push the Rpc to the client. The connection will be closed when