diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-06-12 10:36:54 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-06-12 10:36:54 +0300 |
| commit | 0a291dc4a60d3385c50c1ac38e134270a501581e (patch) | |
| tree | bc7074f5ad2775b45c18b0183ca656b26b76e717 | |
| parent | 9b757f047fc8450d8a7d3d7aa5a7b7e43bfa1312 (diff) | |
| download | vaadin-framework-0a291dc4a60d3385c50c1ac38e134270a501581e.tar.gz vaadin-framework-0a291dc4a60d3385c50c1ac38e134270a501581e.zip | |
Support sending raw JSON values (#8888)
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/JsonCodec.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/src/com/vaadin/terminal/gwt/server/JsonCodec.java index b693514a66..71e4727164 100644 --- a/src/com/vaadin/terminal/gwt/server/JsonCodec.java +++ b/src/com/vaadin/terminal/gwt/server/JsonCodec.java @@ -517,6 +517,8 @@ public class JsonCodec implements Serializable { return connector.getConnectorId(); } else if (value instanceof Enum) { return encodeEnum((Enum<?>) value, application); + } else if (value instanceof JSONArray || value instanceof JSONObject) { + return value; } else { // Any object that we do not know how to encode we encode by looping // through fields |