From fa3754c13dced327c780445b46954e5ec61989f3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Tue, 24 Apr 2012 16:09:11 +0300
Subject: [PATCH] Don't throw NPE if no connector is found (warning is logged
 later)

---
 .../terminal/gwt/server/AbstractCommunicationManager.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index e772aec6cc..a1a917130f 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1400,7 +1400,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
                 final ClientConnector connector = getConnector(app,
                         invocation.getConnectorId());
 
-                if (connector.isConnectorEnabled()) {
+                if (connector != null && connector.isConnectorEnabled()) {
                     enabledConnectors.add(connector);
                 }
             }
-- 
2.39.5