Repository: cxf Updated Branches: refs/heads/master ea512e887 -> d1e764dcf
Few more minor updates to JsonMapObject provider Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2efbac3c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2efbac3c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2efbac3c Branch: refs/heads/master Commit: 2efbac3cd55222b6e85d6f6fb29f63e822974bb7 Parents: 3f35e99 Author: Sergey Beryozkin <[email protected]> Authored: Fri Oct 17 20:18:14 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Fri Oct 17 20:18:14 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java | 2 +- .../org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2efbac3c/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java index 1e6adcd..3001833 100644 --- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java +++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java @@ -25,7 +25,7 @@ import java.util.Map; public class JsonMapObject { Map<String, Integer> updateCount; - private Map<String, Object> values = new LinkedHashMap<String, Object>(); + Map<String, Object> values = new LinkedHashMap<String, Object>(); public JsonMapObject() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/2efbac3c/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java index 9387a7d..9de4059 100644 --- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java +++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java @@ -76,7 +76,8 @@ public class JsonMapObjectProvider implements MessageBodyReader<JsonMapObject>, } else { try { Constructor<?> c = cls.getConstructor(Map.class); - JsonMapObject actualObj = (JsonMapObject)c.newInstance(obj.asMap()); + JsonMapObject actualObj = (JsonMapObject)c.newInstance(); + actualObj.values = obj.values; actualObj.updateCount = obj.updateCount; return actualObj; } catch (Exception ex) {
