From: John Ahlroos <john@vaadin.com>
Date: Mon, 25 Nov 2013 13:45:59 +0000 (+0200)
Subject: Fixed bug where deleting column caused an exception #12830
X-Git-Tag: 7.2.0.beta1~108^2~40
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=27959ff3e6095eae3977fab384845293b2903a59;p=vaadin-framework.git

Fixed bug where deleting column caused an exception #12830

Change-Id: Ia44b11783d9822a6b91ecd0fe7fc0547e7fd4668
---

diff --git a/client/src/com/vaadin/client/ui/grid/GridConnector.java b/client/src/com/vaadin/client/ui/grid/GridConnector.java
index befbc5a50b..ac209b9c2c 100644
--- a/client/src/com/vaadin/client/ui/grid/GridConnector.java
+++ b/client/src/com/vaadin/client/ui/grid/GridConnector.java
@@ -90,11 +90,12 @@ public class GridConnector extends AbstractComponentConnector {
         if (stateChangeEvent.hasPropertyChanged("columns")) {
 
             int totalColumns = getState().columns.size();
-            int currentColumns = getWidget().getColumnCount();
 
             // Remove old columns
             purgeRemovedColumns();
 
+            int currentColumns = getWidget().getColumnCount();
+
             // Add new columns
             for (int columnIndex = currentColumns; columnIndex < totalColumns; columnIndex++) {
                 addColumnFromStateChangeEvent(columnIndex);