summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatu Lund <tatu@vaadin.com>2019-09-09 10:11:10 +0300
committerZhe Sun <31067185+ZheSun88@users.noreply.github.com>2019-10-04 10:20:39 +0300
commit54ceed9ddf25f231897f4d0ff37d0043274bc408 (patch)
treef64dfd057b3ecd904eaab6a429239c66b47c3f41
parenta098e58ceb348a2b22a4a44071fe84bfcf2ebc3d (diff)
downloadvaadin-framework-54ceed9ddf25f231897f4d0ff37d0043274bc408.tar.gz
vaadin-framework-54ceed9ddf25f231897f4d0ff37d0043274bc408.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
-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