From 3b904640cc56b6100d43a429aaedd462adcf46a1 Mon Sep 17 00:00:00 2001 From: Artur Date: Mon, 7 May 2018 09:42:18 +0300 Subject: Restart debug log timer on first log row instead of immediately (#10640) --- .../main/java/com/vaadin/client/debug/internal/VDebugWindow.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java b/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java index d8112f121b..0d67c46ce9 100644 --- a/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java +++ b/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java @@ -111,7 +111,7 @@ public final class VDebugWindow extends VOverlay { // Timers since application start, and last timer reset private static final Duration START = new Duration(); - private static Duration lastReset = START; + private static Duration lastReset = null; // outer panel protected FlowPanel window = new FlowPanel(); @@ -629,6 +629,10 @@ public final class VDebugWindow extends VOverlay { * @return */ static int getMillisSinceReset() { + if (lastReset == null) { + lastReset = new Duration(); + } + return lastReset.elapsedMillis(); } @@ -639,7 +643,7 @@ public final class VDebugWindow extends VOverlay { */ static int resetTimer() { int sinceLast = lastReset.elapsedMillis(); - lastReset = new Duration(); + lastReset = null; return sinceLast; } -- cgit v1.2.3