From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Fri, 15 Jun 2007 06:08:05 +0000 (+0000)
Subject: Made json-parser more reliable
X-Git-Tag: 6.7.0.beta1~6245
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0b7505f7de5d7f2309f36cd1eccc08dd45940604;p=vaadin-framework.git

Made json-parser more reliable

svn changeset:1740/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Client.java b/src/com/itmill/toolkit/terminal/gwt/client/Client.java
index ed2a6f7400..174b4797f9 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/Client.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/Client.java
@@ -101,7 +101,14 @@ public class Client implements EntryPoint {
 	private void handleReceivedJSONMessage(Response response) {
 		Date start = new Date();
 		String jsonText = response.getText().substring(3) + "}";
-		JSONValue json = JSONParser.parse(jsonText);
+		JSONValue json;
+		try {
+			json = JSONParser.parse(jsonText);
+		} catch (com.google.gwt.json.client.JSONException e) {
+			console.log(e.getMessage() + " - Original JSON-text:");
+			console.log(jsonText);
+			return;
+		}
 		// Process changes
 		JSONArray changes = (JSONArray) ((JSONObject) json).get("changes");
 		for (int i = 0; i < changes.size(); i++) {