From 57a965251afdb5ee9ac1913a0101d854d8215aa6 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 16 Sep 2016 22:21:11 +0300
Subject: [PATCH] Fix assertion error when column widths are calculated

Change-Id: I042a5bfb548b52911100e01e5a74901a1abfbf33
---
 client/src/main/java/com/vaadin/client/widgets/Grid.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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();
-- 
2.39.5