From 40582761f7c23b016155e173d1cb3bd73b3086fb Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Wed, 31 Dec 2014 12:37:52 +0200
Subject: Fix Grid Header/Footer creating cells for unused properties (#15487)

Change-Id: I783fa6fdb44b0d5693723fc52cdb7fed3499dea1
---
 server/src/com/vaadin/ui/Grid.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'server/src')

diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 0f6912be1a..d61458297a 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -1487,8 +1487,7 @@ public class Grid extends AbstractComponent implements SelectionNotifier,
             rows.add(index, row);
             getSectionState().rows.add(index, row.getRowState());
 
-            Indexed dataSource = grid.getContainerDataSource();
-            for (Object id : dataSource.getContainerPropertyIds()) {
+            for (Object id : grid.columns.keySet()) {
                 row.addCell(id);
             }
 
-- 
cgit v1.2.3