diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/communication/UidlWriter.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/server/src/com/vaadin/server/communication/UidlWriter.java b/server/src/com/vaadin/server/communication/UidlWriter.java index d49e7d9cbf..81bbb91649 100644 --- a/server/src/com/vaadin/server/communication/UidlWriter.java +++ b/server/src/com/vaadin/server/communication/UidlWriter.java @@ -32,10 +32,10 @@ import org.json.JSONException; import com.vaadin.annotations.JavaScript; import com.vaadin.annotations.StyleSheet; -import com.vaadin.server.LegacyCommunicationManager; -import com.vaadin.server.LegacyCommunicationManager.ClientCache; import com.vaadin.server.ClientConnector; import com.vaadin.server.JsonPaintTarget; +import com.vaadin.server.LegacyCommunicationManager; +import com.vaadin.server.LegacyCommunicationManager.ClientCache; import com.vaadin.server.SystemMessages; import com.vaadin.server.VaadinSession; import com.vaadin.ui.ConnectorTracker; @@ -73,8 +73,7 @@ public class UidlWriter implements Serializable { ArrayList<ClientConnector> dirtyVisibleConnectors = ui .getConnectorTracker().getDirtyVisibleConnectors(); VaadinSession session = ui.getSession(); - LegacyCommunicationManager manager = session - .getCommunicationManager(); + LegacyCommunicationManager manager = session.getCommunicationManager(); // Paints components ConnectorTracker uiConnectorTracker = ui.getConnectorTracker(); getLogger().log(Level.FINE, "* Creating response to client"); @@ -136,8 +135,6 @@ public class UidlWriter implements Serializable { new ConnectorHierarchyWriter().write(ui, writer); writer.write(", "); // close hierarchy - uiConnectorTracker.markAllConnectorsClean(); - // send server to client RPC calls for components in the UI, in call // order @@ -148,6 +145,8 @@ public class UidlWriter implements Serializable { new ClientRpcWriter().write(ui, writer); writer.write(", "); // close rpc + uiConnectorTracker.markAllConnectorsClean(); + writer.write("\"meta\" : "); SystemMessages messages = ui.getSession().getService() |