Author: sergeyb Date: Wed Jan 23 12:37:12 2013 New Revision: 1437367 URL: http://svn.apache.org/viewvc?rev=1437367&view=rev Log: Merged revisions 1437365 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1437365 | sergeyb | 2013-01-23 12:30:55 +0000 (Wed, 23 Jan 2013) | 9 lines Merged revisions 1437364 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1437364 | sergeyb | 2013-01-23 12:28:08 +0000 (Wed, 23 Jan 2013) | 1 line Minor update to JSONUtils to minimize the need to switch to newer Jettison ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1437365 Merged /cxf/trunk:r1437364 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java?rev=1437367&r1=1437366&r2=1437367&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java Wed Jan 23 12:37:12 2013 @@ -148,8 +148,10 @@ public final class JSONUtils { namespaceMap.putIfAbsent(XSI_URI, XSI_PREFIX); } Configuration conf = new Configuration(namespaceMap); - conf.setPrimitiveArrayKeys(primitiveArrayKeys == null - ? Collections.<String>emptySet() : new HashSet<String>(primitiveArrayKeys)); + if (primitiveArrayKeys != null) { + conf.setPrimitiveArrayKeys( + new HashSet<String>(primitiveArrayKeys)); + } XMLInputFactory factory = depthProps != null ? new JettisonMappedReaderFactory(conf, depthProps) : new MappedXMLInputFactory(conf);
