From: Artur Signell <artur@vaadin.com>
Date: Fri, 16 Sep 2016 19:21:11 +0000 (+0300)
Subject: Fix assertion error when column widths are calculated
X-Git-Tag: 7.7.2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=57a965251afdb5ee9ac1913a0101d854d8215aa6;p=vaadin-framework.git

Fix assertion error when column widths are calculated

Change-Id: I042a5bfb548b52911100e01e5a74901a1abfbf33
---

diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index e55940582b..2b117dc8e4 100644
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -3214,7 +3214,8 @@ public class Grid<T> extends ResizeComposite implements
         private void calculate() {
             isScheduled = false;
             rescheduleCount = 0;
-            assert !dataIsBeingFetched : "Trying to calculate column widths even though data is still being fetched.";
+            assert !(currentDataAvailable.isEmpty()
+                    && dataIsBeingFetched) : "Trying to calculate column widths without data while data is still being fetched.";
 
             if (columnsAreGuaranteedToBeWiderThanGrid()) {
                 applyColumnWidths();