Fix Grid unnecessarily cleaning up stored property information (#15482)

Change-Id: Id77e9101dec77924eb19c19c2cf34702db4d9f6a

diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 3d203296d79a1f1841de7203db942df0ea448a1b..0f6912be1adf427e7a5f7411ee7e57614a1a9283 100644 (file)
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -2810,7 +2810,6 @@ public class Grid extends AbstractComponent implements SelectionNotifier,
             removeExtension(datasourceExtension);
         }
 
-        columnKeys.removeAll();
         datasource = container;
 
         resetEditor();

diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
index f401fba1e31f116fde225a05d8902f2a48eeca94..97f0355b4bf2d0010d153b2e9da50200e1f4d081 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
@@ -102,6 +102,12 @@ public class GridColumnAddingAndRemovingTest {
         grid.setContainerDataSource(container2);
         assertNull("Grid should not have a column for property foo",
                 grid.getColumn("foo"));
+        assertNotNull("Grid did should have a column for property bar",
+                grid.getColumn("bar"));
+        for (Grid.Column column : grid.getColumns()) {
+            assertNotNull("Grid getColumns returned a null value", column);
+        }
+
         grid.removeAllColumns();
         grid.addColumn("foo");
         assertNotNull("Grid should now have a column for property foo",