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 befbc5a50ba8336968a56d6e68527e87226f45d7..ac209b9c2c52cbd98747dfce7cb232ea2e8ce587 100644 (file)
--- 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);