1 files changed, 10 insertions, 12 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index ce8683ce90..d757bf89a2 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -147,8 +147,6 @@ public class ApplicationConnection {
      */
     public static final String UIDL_REFRESH_TOKEN = "Vaadin-Refresh";
 
-    private final boolean debugLogging = true || false;
-
     // will hold the UIDL security key (for XSS protection) once received
     private String uidlSecurityKey = "init";
 
@@ -1162,16 +1160,6 @@ public class ApplicationConnection {
                 updateDuration.logDuration(" * Creating connectors completed",
                         10);
 
-                if (debugLogging) {
-                    VConsole.log(" * Dumping state changes to the console");
-                    VConsole.dirUIDL(json, ApplicationConnection.this);
-
-                    updateDuration
-                            .logDuration(
-                                    " * Dumping state changes to the console completed",
-                                    10);
-                }
-
                 // Update states, do not fire events
                 Collection<StateChangeEvent> pendingStateChangeEvents = updateConnectorState(json);
 
@@ -1238,6 +1226,16 @@ public class ApplicationConnection {
                 updateDuration
                         .logDuration(" * Layout processing completed", 10);
 
+                if (ApplicationConfiguration.isDebugMode()) {
+                    VConsole.log(" * Dumping state changes to the console");
+                    VConsole.dirUIDL(json, ApplicationConnection.this);
+
+                    updateDuration
+                            .logDuration(
+                                    " * Dumping state changes to the console completed",
+                                    10);
+                }
+
                 if (meta != null) {
                     if (meta.containsKey("appError")) {
                         ValueMap error = meta.getValueMap("appError");