Always paint child components as deferred to ensure the state is sent to

the client

diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index 4470970095d20911cd15e73646f6309c5d5d93c6..8a57d2110ea7b73251104c5f40ba56924fa5f584 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -702,16 +702,16 @@ public class JsonPaintTarget implements PaintTarget {
         openPaintables.push(paintable);
         openPaintableTags.push(tagName);
 
-        if (cacheEnabled && isPreviouslyPainted) {
-            // cached (unmodified) paintable, paint the it now
-            paintedComponents.add(paintable);
-            deferredPaintables.remove(paintable);
-            return PaintStatus.CACHED;
-        } else if (!topLevelPaintableTag) {
+        if (!topLevelPaintableTag) {
             // notify manager: add to paint queue instead of painting now
             manager.queuePaintable(paintable);
             deferredPaintables.add(paintable);
             return PaintStatus.DEFER;
+        } else if (cacheEnabled && isPreviouslyPainted) {
+            // cached (unmodified) paintable, paint the it now
+            paintedComponents.add(paintable);
+            deferredPaintables.remove(paintable);
+            return PaintStatus.CACHED;
         } else {
             // not a nested paintable, paint the it now
             paintedComponents.add(paintable);