Workaround for #6064 until fixed for real

svn changeset:16190/svn branch:6.5

1 files changed, 7 insertions, 2 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index c74199b3a8..5bede15597 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2203,14 +2203,19 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 colIndex = getColIndexByKey(cid);
                 boolean noCells = false;
                 TableRowElement item = rows.getItem(0);
-                TableCellElement colTD = item.getCells().getItem(colIndex);
+
+                // FIXME: Changed this from colIndex to 0 to workaround #6064
+                TableCellElement colTD = item.getCells().getItem(0);
                 if (colTD == null) {
                     // content is currently empty, we need to add a fake cell
                     // for measuring
                     noCells = true;
                     VScrollTableRow next = (VScrollTableRow) iterator().next();
                     next.addCell(null, "", align, "", true, isSorted());
-                    colTD = item.getCells().getItem(colIndex);
+
+                    // FIXME: Changed this from colIndex to 0 to workaround
+                    // #6064
+                    colTD = item.getCells().getItem(0);
                 }
                 com.google.gwt.dom.client.Element wrapper = colTD
                         .getFirstChildElement();