summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-04-17 15:34:23 +0300
committerLeif Åstrand <leif@vaadin.com>2012-04-17 15:34:23 +0300
commitde0ac4f68daf5cdd3cbe2ef3a8a5ea6267fcf7a0 (patch)
treeb22905acaa915970e9bf3021e8e8022d6db30c26
parent025dbd6e6de9b1c97384d5498429c4d3d0554746 (diff)
downloadvaadin-framework-de0ac4f68daf5cdd3cbe2ef3a8a5ea6267fcf7a0.tar.gz
vaadin-framework-de0ac4f68daf5cdd3cbe2ef3a8a5ea6267fcf7a0.zip
Don't throw NPE when getting RPC for non-existing connector id
-rw-r--r--src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index d67ad36838..bb6e726166 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1553,6 +1553,15 @@ public abstract class AbstractCommunicationManager implements Serializable {
Connector c = app.getConnector(invocation.getConnectorId());
if (c instanceof RpcTarget) {
ServerRpcManager.applyInvocation((RpcTarget) c, invocation);
+ } else if (c == null) {
+ logger.log(
+ Level.WARNING,
+ "RPC call " + invocation.getInterfaceName() + "."
+ + invocation.getMethodName()
+ + " received for connector id "
+ + invocation.getConnectorId()
+ + " but no such connector could be found");
+
} else {
logger.log(Level.WARNING, "RPC call received for connector "
+ c.getClass().getName() + " (" + c.getConnectorId()