cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1437364 - /cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
Date Wed, 23 Jan 2013 12:28:08 GMT
Author: sergeyb
Date: Wed Jan 23 12:28:08 2013
New Revision: 1437364

URL: http://svn.apache.org/viewvc?rev=1437364&view=rev
Log:
Minor update to JSONUtils to minimize the need to switch to newer Jettison

Modified:
    cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java

Modified: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java?rev=1437364&r1=1437363&r2=1437364&view=diff
==============================================================================
--- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
(original)
+++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
Wed Jan 23 12:28:08 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);



Mime
View raw message