summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorTatu Lund <tatu@vaadin.com>2019-09-09 10:11:10 +0300
committerAnna Koskinen <Ansku@users.noreply.github.com>2019-09-09 10:11:10 +0300
commitb379d6bb2c977449dd840b15db32e79ca6aa883e (patch)
tree6f9b7ad7f637f53647ef6e9e550fc9a7831a528c /server
parent1e36e3097fe4c42f358ed5dcd11a1003588a9162 (diff)
downloadvaadin-framework-b379d6bb2c977449dd840b15db32e79ca6aa883e.tar.gz
vaadin-framework-b379d6bb2c977449dd840b15db32e79ca6aa883e.zip
Removal of data communicator needs to happen before call to super.remove() (#11710)
Removal of data communicator needs to happen before call to super.remove() since super.remove() sets parent to null causing the NPE. Fixes https://github.com/vaadin/framework/issues/11617
Diffstat (limited to 'server')
-rw-r--r--server/src/main/java/com/vaadin/ui/components/grid/GridDragSource.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/GridDragSource.java b/server/src/main/java/com/vaadin/ui/components/grid/GridDragSource.java
index 540d8f2d8a..e6f8ed2926 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/GridDragSource.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/GridDragSource.java
@@ -256,10 +256,10 @@ public class GridDragSource<T> extends DragSourceExtension<Grid<T>> {
@Override
public void remove() {
- super.remove();
-
getParent().getDataCommunicator()
.removeDataGenerator(dragDataGenerator);
+
+ super.remove();
}
@Override