diff options
| author | Artur Signell <artur@vaadin.com> | 2014-03-10 20:38:50 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-03-11 07:07:26 +0000 |
| commit | 0d1f0b9aab1cf9e9aed9e2ec4a03a3c6c8c509cb (patch) | |
| tree | 1164814b951d6e99e0a5adb42267e663cbeb1585 /server | |
| parent | 4e5d14e1e2e90c0be9f4a5b1dfb40d55d7620ce2 (diff) | |
| download | vaadin-framework-0d1f0b9aab1cf9e9aed9e2ec4a03a3c6c8c509cb.tar.gz vaadin-framework-0d1f0b9aab1cf9e9aed9e2ec4a03a3c6c8c509cb.zip | |
Fix Android/org.json incompatibility (#13277)
Change-Id: I5ff4ae771420fae22e403bd7dcb3961f4ef53e14
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/VaadinService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java index b457436b8f..b332e6a2e8 100644 --- a/server/src/com/vaadin/server/VaadinService.java +++ b/server/src/com/vaadin/server/VaadinService.java @@ -1569,9 +1569,9 @@ public abstract class VaadinService implements Serializable { meta.put("appError", appError); JSONObject json = new JSONObject(); - json.put("changes", Collections.EMPTY_LIST); - json.put("resources", Collections.EMPTY_MAP); - json.put("locales", Collections.EMPTY_LIST); + json.put("changes", new JSONObject()); + json.put("resources", new JSONObject()); + json.put("locales", new JSONObject()); json.put("meta", meta); returnString = json.toString(); } catch (JSONException e) { |