Fix variable change combining loop to support other RPC calls (#8277).

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index c359d70ea7c59b303cdec7d0e44d2b9ae08fe297..08e8862e853faf39a8828d2300a9eceba564e301 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1248,7 +1248,9 @@ public abstract class AbstractCommunicationManager implements
                                     change.getValue()));
                     while (nextInvocation != null
                             && invocation.getPaintableId().equals(
-                                    nextInvocation.getPaintableId())) {
+                                    nextInvocation.getPaintableId())
+                            && ApplicationConnection.UPDATE_VARIABLE_METHOD
+                                    .equals(nextInvocation.getMethodName())) {
                         change = new VariableChange(invocation);
                         m.put(change.getName(),
                                 convertVariableValue(change.getType(),