Prevent Grid refreshAll from getting stuck due mismatched state (#10161)

Fixes #10038

diff --git a/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java b/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java
index b41a5f3546f226aa288d141e034e2ab4279d0aa7..e4c483536b59f74a4ee57f0ffb6a40bafc10f6fd 100644 (file)
--- a/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java
+++ b/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java
@@ -766,9 +766,6 @@ public class DataCommunicator<T> extends AbstractExtension {
     }
 
     private void hardReset() {
-        if (reset) {
-            return;
-        }
         reset = true;
         markAsDirty();
     }

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataProviderRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataProviderRefresh.java
new file mode 100644 (file)
index 0000000..4dc1795
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataProviderRefresh.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2000-2017 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+
+import com.vaadin.data.provider.AbstractBackEndDataProvider;
+import com.vaadin.data.provider.Query;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Grid;
+
+/**
+ * Tests that Grid refresh doesn't get stuck when filtering doesn't match row
+ * requests.
+ *
+ * @author Vaadin Ltd
+ */
+public class GridDataProviderRefresh extends SimpleGridUI {
+
+    private volatile Boolean filter = false;
+
+    private Stream<AtomicReference<String>> fetchValue(Boolean filter) {
+        if (filter) {
+            return Arrays
+                    .asList("One", String.valueOf(System.currentTimeMillis()))
+                    .stream().map(s -> new AtomicReference<>(s));
+        } else {
+            return Stream.empty();
+        }
+    }
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        AbstractBackEndDataProvider<AtomicReference<String>, Object> dataProvider = new AbstractBackEndDataProvider<AtomicReference<String>, Object>() {
+            @Override
+            protected Stream<AtomicReference<String>> fetchFromBackEnd(
+                    Query<AtomicReference<String>, Object> query) {
+                try {
+                    Thread.sleep(250);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                return fetchValue(filter);
+            }
+
+            @Override
+            protected int sizeInBackEnd(
+                    Query<AtomicReference<String>, Object> query) {
+                return (int) fetchValue(filter).count();
+            }
+        };
+
+        Grid<AtomicReference<String>> grid = new Grid<>();
+        grid.setDataProvider(dataProvider);
+        grid.addColumn(AtomicReference::get);
+        addComponent(grid);
+
+        Button button = new Button("Refresh");
+        button.addClickListener(event1 -> {
+            filter = new Boolean(!filter);
+            dataProvider.refreshAll();
+        });
+        addComponent(button);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Grid refreshAll shouldn't get stuck when filtering doesn't match row requests "
+                + "(randomly triggered when button is clicked fast enough "
+                + "several times in a row, especially if using old and slow Windows)";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 10038;
+    }
+}