aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-03-27 16:47:46 +0300
committerArtur Signell <artur@vaadin.com>2012-03-27 17:31:54 +0300
commit57d331965ac46bf83ec993877d100396afcf4b13 (patch)
tree745edf026439bab2db1d3112c2a9e267a030ea83
parent873650ce5b609ca16d59d6d3350a6a96aedc3dcf (diff)
downloadvaadin-framework-57d331965ac46bf83ec993877d100396afcf4b13.tar.gz
vaadin-framework-57d331965ac46bf83ec993877d100396afcf4b13.zip
Fixed NPE that occured when RPC target had been removed (#8501)
-rw-r--r--src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index ea5817ab79..64d38dc110 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1437,7 +1437,8 @@ public abstract class AbstractCommunicationManager implements Serializable {
invocation.getConnectorId());
final VariableOwner owner = (VariableOwner) connector;
- boolean connectorEnabled = connector.isConnectorEnabled();
+ boolean connectorEnabled = (connector != null && connector
+ .isConnectorEnabled());
if (owner != null && connectorEnabled) {
VariableChange change = new VariableChange(invocation);