1 files changed, 4 insertions, 1 deletions
diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java
index 2655ee9a00..08ad48ff3d 100644
--- a/server/src/com/vaadin/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java
@@ -832,7 +832,6 @@ public abstract class AbstractCommunicationManager implements Serializable {
                     .isClientSideInitialized(connector);
             connector.beforeClientResponse(!initialized);
         }
-        uiConnectorTracker.markAllConnectorsClean();
 
         outWriter.print("\"changes\":[");
 
@@ -943,6 +942,8 @@ public abstract class AbstractCommunicationManager implements Serializable {
         outWriter.append(hierarchyInfo.toString());
         outWriter.print(", "); // close hierarchy
 
+        uiConnectorTracker.markAllConnectorsClean();
+
         // send server to client RPC calls for components in the UI, in call
         // order
 
@@ -1233,6 +1234,8 @@ public abstract class AbstractCommunicationManager implements Serializable {
             uiConnectorTracker.markClientSideInitialized(connector);
         }
 
+        assert (uiConnectorTracker.getDirtyConnectors().isEmpty()) : "Connectors have been marked as dirty during the end of the paint phase. This is most certainly not intended.";
+
         writePerformanceData(outWriter);
     }