You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/10/17 21:21:02 UTC
git commit: Few more minor updates to JsonMapObject provider
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 4380d3f51 -> 1d7d2a304
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/1d7d2a30
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1d7d2a30
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1d7d2a30
Branch: refs/heads/3.0.x-fixes
Commit: 1d7d2a30452d2323ef7c262c88254d1c38b305c9
Parents: 4380d3f
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Oct 17 20:18:14 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Fri Oct 17 20:20:44 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/1d7d2a30/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/1d7d2a30/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) {