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 2011/07/21 01:15:48 UTC
svn commit: r1148973 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Author: sergeyb
Date: Wed Jul 20 23:15:48 2011
New Revision: 1148973
URL: http://svn.apache.org/viewvc?rev=1148973&view=rev
Log:
Merged revisions 1148972 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1148972 | sergeyb | 2011-07-21 00:13:43 +0100 (Thu, 21 Jul 2011) | 1 line
[CXF-3159] Better handling of Jettison related CL issues - thanks to Mike Youngstrom
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 20 23:15:48 2011
@@ -1 +1 @@
-/cxf/trunk:1144977,1145682,1146773,1147504,1148067,1148077,1148235,1148257,1148281,1148955,1148962
+/cxf/trunk:1144977,1145682,1146773,1147504,1148067,1148077,1148235,1148257,1148281,1148955,1148962,1148972
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=1148973&r1=1148972&r2=1148973&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java Wed Jul 20 23:15:48 2011
@@ -70,6 +70,10 @@ public class JSONProvider extends Abstra
private static final String MAPPED_CONVENTION = "mapped";
private static final String BADGER_FISH_CONVENTION = "badgerfish";
+ static {
+ new SimpleConverter();
+ }
+
private ConcurrentHashMap<String, String> namespaceMap =
new ConcurrentHashMap<String, String>();
private boolean serializeAsArray;