From b4218b866880b4071e56ed76ff061010787fadd6 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 25 Apr 2013 14:44:36 +0300
Subject: Ensure RPC are not delivered to closed UIs (#11714)

Change-Id: I7fadaa5d5190c36cd83a06249d7ae1d4475724e0
---
 .../com/vaadin/server/communication/ServerRpcHandler.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'server')

diff --git a/server/src/com/vaadin/server/communication/ServerRpcHandler.java b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
index 64f8dfb223..62949615fb 100644
--- a/server/src/com/vaadin/server/communication/ServerRpcHandler.java
+++ b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
@@ -197,6 +197,20 @@ public class ServerRpcHandler implements Serializable {
                     getLogger().warning(msg);
                     continue;
                 }
+                if (connector.getUI().isClosing()) {
+                    String msg = "Ignoring RPC call for connector "
+                            + connector.getClass().getName();
+                    if (connector instanceof Component) {
+                        String caption = ((Component) connector).getCaption();
+                        if (caption != null) {
+                            msg += ", caption=" + caption;
+                        }
+                    }
+                    msg += " in closed UI";
+                    getLogger().warning(msg);
+                    continue;
+
+                }
 
                 if (invocation instanceof ServerRpcMethodInvocation) {
                     try {
-- 
cgit v1.2.3