From 9b56a22ae891574fa6a899f66d144d6f01a874ec Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 29 Apr 2013 09:52:43 +0300
Subject: Fixed NPE in UI check (#11714)

Change-Id: I837a15c2ac58119ec203c1b214e19381184c8617
---
 server/src/com/vaadin/server/communication/ServerRpcHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/src/com/vaadin/server/communication/ServerRpcHandler.java b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
index e0e7494ca8..3cc85909ee 100644
--- a/server/src/com/vaadin/server/communication/ServerRpcHandler.java
+++ b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
@@ -193,7 +193,8 @@ public class ServerRpcHandler implements Serializable {
                     getLogger().warning(msg);
                     continue;
                 }
-                if (connector.getUI().isClosing()) {
+                // DragAndDropService has null UI
+                if (connector.getUI() != null && connector.getUI().isClosing()) {
                     String msg = "Ignoring RPC call for connector "
                             + connector.getClass().getName();
                     if (connector instanceof Component) {
-- 
cgit v1.2.3