From: Artur Signell <artur@vaadin.com>
Date: Fri, 16 Sep 2016 11:11:26 +0000 (+0300)
Subject: Ensure temporary layout manager state is cleared at the end of a layout phase
X-Git-Tag: 7.7.2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c665731b0b97b697e80c47955d3558c19f0c81cb;p=vaadin-framework.git

Ensure temporary layout manager state is cleared at the end of a layout phase

Change-Id: I28f3d20e6db999a033429338535719f14e495d4f
---

diff --git a/client/src/main/java/com/vaadin/client/LayoutManager.java b/client/src/main/java/com/vaadin/client/LayoutManager.java
index ed83e195d7..371ea46d3d 100644
--- a/client/src/main/java/com/vaadin/client/LayoutManager.java
+++ b/client/src/main/java/com/vaadin/client/LayoutManager.java
@@ -600,6 +600,13 @@ public class LayoutManager {
         Profiler.leave("layout PostLayoutListener");
 
         cleanMeasuredSizes();
+        // Ensure temporary variables are cleaned
+        if (!pendingOverflowFixes.isEmpty()) {
+            getLogger().warning(
+                    "pendingOverflowFixes is not empty at the end of doLayout: "
+                            + pendingOverflowFixes.dump());
+            pendingOverflowFixes = FastStringSet.create();
+        }
 
         getLogger().info(
                 "Total layout phase time: " + totalDuration.elapsedMillis()