Removal of data communicator needs to happen before call to super.rem…

…ove() (#11710) Removal of data communicator needs to happen before call to super.remove() since super.remove() sets parent to null causing the NPE. Fixes #11617
vaadin · Oct 4, 2019 · 54ceed9 · 54ceed9
1 parent a098e58
commit 54ceed9
Showing 1 changed file with 2 additions and 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
@@ -256,10 +256,10 @@ public Registration addGridDragEndListener(
 
     @Override
     public void remove() {
-        super.remove();
-
         getParent().getDataCommunicator()
                 .removeDataGenerator(dragDataGenerator);
+
+        super.remove();
     }
 
     @Override