summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/communication/MessageHandler.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/communication/MessageHandler.java b/client/src/com/vaadin/client/communication/MessageHandler.java
index 96f9992b6e..3ffadeb9ce 100644
--- a/client/src/com/vaadin/client/communication/MessageHandler.java
+++ b/client/src/com/vaadin/client/communication/MessageHandler.java
@@ -1784,7 +1784,11 @@ public class MessageHandler {
private static native ValueMap parseJSONResponse(String jsonText)
/*-{
- return JSON.parse(jsonText);
+ try {
+ return JSON.parse(jsonText);
+ } catch (ignored) {
+ return eval('(' + jsonText + ')');
+ }
}-*/;
/**