From 1dc8c5c28c5d8990f15a69ea466cdf5178305a78 Mon Sep 17 00:00:00 2001 From: Fabian Lange Date: Wed, 20 Aug 2014 11:56:21 +0200 Subject: fixes incorrect JSONArray/String usage in ServerRpcHandler (#14471) As described by Johannes, the RPCRequest constructor first takes whole JSON as string and builds its attribute json from it (by parsing). Then it reads from this parsed JSON the array called "rpc". However it previously did a .toString on it only to re-parse it. Newer json versions complain that "rpc" is not a string, but an array. Change-Id: If4bb45abad551b183d757f0aa326c37c070ce103 --- server/src/com/vaadin/server/communication/ServerRpcHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/vaadin/server/communication/ServerRpcHandler.java b/server/src/com/vaadin/server/communication/ServerRpcHandler.java index 9107a4e049..ae076e0856 100644 --- a/server/src/com/vaadin/server/communication/ServerRpcHandler.java +++ b/server/src/com/vaadin/server/communication/ServerRpcHandler.java @@ -91,8 +91,8 @@ public class ServerRpcHandler implements Serializable { } else { syncId = -1; } - invocations = new JSONArray( - json.getString(ApplicationConstants.RPC_INVOCATIONS)); + invocations = json + .getJSONArray(ApplicationConstants.RPC_INVOCATIONS); } /** -- cgit v1.2.3