From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 19 Dec 2007 08:05:52 +0000 (+0000)
Subject: Fixes multiple variable issues
X-Git-Tag: 6.7.0.beta1~5220
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3459fb7113f14af44606c9e04e1523055fcb247f;p=vaadin-framework.git

Fixes multiple variable issues

svn changeset:3260/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
index d758c833b6..5b47cb16e0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
@@ -461,14 +461,14 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
             final String[] ca = changes.split("\u0001");
             for (int i = 0; i < ca.length; i++) {
                 // extract variable info from key of format
-                // "PID_variableName_type"
+                // "PID|variableName|type"
                 String[] vid = ca[i].split("\\|");
                 final VariableOwner owner = (VariableOwner) idPaintableMap
                         .get(vid[0]);
                 if (owner != null) {
                     Map m;
                     if (i + 2 >= ca.length
-                            || !vid[0].equals(ca[i + 2].split("|")[0])) {
+                            || !vid[0].equals(ca[i + 2].split("\\|")[0])) {
                         if (ca.length > i + 1) {
                             m = new SingleValueMap(vid[1],
                                     convertVariableValue(vid[2].charAt(0),
@@ -483,8 +483,8 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
                                 ca[++i]));
                     }
                     while (i + 1 < ca.length
-                            && vid[0].equals(ca[i + 1].split("|")[0])) {
-                        vid = ca[++i].split("|");
+                            && vid[0].equals(ca[i + 1].split("\\|")[0])) {
+                        vid = ca[++i].split("\\|");
                         m.put(vid[1], convertVariableValue(vid[2].charAt(0),
                                 ca[++i]));
                     }