diff options
| author | Artur Signell <artur@vaadin.com> | 2013-04-29 09:52:43 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-04-29 09:55:16 +0300 |
| commit | 9b56a22ae891574fa6a899f66d144d6f01a874ec (patch) | |
| tree | ee9c077bee6eb0df1c9416de170df50a6cddce63 /server | |
| parent | e847b21f2b0b202258911b7425645e46b3816ee1 (diff) | |
| download | vaadin-framework-9b56a22ae891574fa6a899f66d144d6f01a874ec.tar.gz vaadin-framework-9b56a22ae891574fa6a899f66d144d6f01a874ec.zip | |
Fixed NPE in UI check (#11714)
Change-Id: I837a15c2ac58119ec203c1b214e19381184c8617
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/communication/ServerRpcHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |