summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-02-08 16:42:00 +0200
committerTeemu Suo-Anttila <teemusa@vaadin.com>2016-02-15 17:11:26 +0200
commitf8e2cd09c683a03f9721d124246391c6f45c8d84 (patch)
treeda8c05a4f986a567b3469569df43aca4abff4f47 /server/src/com/vaadin
parent9799ed309bf7f996eab48f6dec32ced5c408fb03 (diff)
downloadvaadin-framework-f8e2cd09c683a03f9721d124246391c6f45c8d84.tar.gz
vaadin-framework-f8e2cd09c683a03f9721d124246391c6f45c8d84.zip
Fix removing extension from a connector that is not its parent (#19569)
Change-Id: I9c40d3d85386437a640879470ab3b0cdfe042a42
Diffstat (limited to 'server/src/com/vaadin')
-rw-r--r--server/src/com/vaadin/server/AbstractClientConnector.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index fa2b741ddd..c624663d50 100644
--- a/server/src/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -589,6 +589,11 @@ public abstract class AbstractClientConnector implements ClientConnector,
@Override
public void removeExtension(Extension extension) {
+ if (extension.getParent() != this) {
+ throw new IllegalArgumentException(
+ "This connector is not the parent for given extension");
+ }
+
extension.setParent(null);
extensions.remove(extension);
markAsDirty();