From c665731b0b97b697e80c47955d3558c19f0c81cb Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Fri, 16 Sep 2016 14:11:26 +0300 Subject: [PATCH] Ensure temporary layout manager state is cleared at the end of a layout phase Change-Id: I28f3d20e6db999a033429338535719f14e495d4f --- client/src/main/java/com/vaadin/client/LayoutManager.java | 7 +++++++ 1 file changed, 7 insertions(+) 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() -- 2.39.5