From 8e30c36d0bd1eb899d416d34fabbfac7a7f63c79 Mon Sep 17 00:00:00 2001
From: Henri Sara <hesara@vaadin.com>
Date: Thu, 19 Jan 2012 09:27:41 +0200
Subject: [PATCH] Fix variable change combining loop to support other RPC calls
 (#8277).

---
 .../terminal/gwt/server/AbstractCommunicationManager.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index c359d70ea7..08e8862e85 100644
--- 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(),
-- 
2.39.5