Fix AbstractRemoteDataSource cache clean up on remove (#19482)

Change-Id: Ib9fc54ef018afe7f571204aba41182333b77c47f

1 files changed, 7 insertions, 3 deletions

diff --git a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
index 380531694d..05ac7182c5 100644
--- a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
+++ b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
@@ -324,8 +324,10 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
             // Called after dropping from cache. Dropped row is passed as a
             // parameter, but is no longer present in the DataSource
             T removed = indexToRowMap.remove(Integer.valueOf(i));
-            onDropFromCache(i, removed);
-            keyToIndexMap.remove(getRowKey(removed));
+            if (removed != null) {
+                onDropFromCache(i, removed);
+                keyToIndexMap.remove(getRowKey(removed));
+            }
         }
     }
 
@@ -534,13 +536,15 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
 
         size -= count;
 
+        Range removedRange = Range.withLength(firstRowIndex, count);
+        dropFromCache(removedRange);
+
         // shift indices to fill the cache correctly
         int firstMoved = Math.max(firstRowIndex + count, cached.getStart());
         for (int i = firstMoved; i < cached.getEnd(); i++) {
             moveRowFromIndexToIndex(i, i - count);
         }
 
-        Range removedRange = Range.withLength(firstRowIndex, count);
         if (cached.isSubsetOf(removedRange)) {
             // Whole cache is part of the removal. Empty cache
             cached = Range.withLength(0, 0);