summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2011-10-10 05:01:04 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2011-10-10 05:01:04 +0000
commit7eafc42e6b7b01d9dfd8d7f4f1e68969d3ace806 (patch)
tree6aa85c3578b8b58ac8fdc1527e538c2d9c236f3e /sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
parente36653405dac9419e8ae60d1d014f1eea38852a2 (diff)
Use home-grown JSONRPC implementation
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1180780 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java')
-rw-r--r--sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index 028690a789..a17c08ad20 100644
--- a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
@@ -97,8 +97,8 @@ public class JSONHelper {
if (type == JSONArray.class || type.isArray() || Collection.class.isAssignableFrom(type)) {
return new JSONArray(json);
}
- return new org.json.JSONObject(json);
- } catch (org.json.JSONException e) {
+ return JacksonHelper.MAPPER.readValue(json, org.json.JSONObject.class);
+ } catch (Exception e) {
throw new IllegalArgumentException(e);
}
}