cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1519420 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
Date Mon, 02 Sep 2013 12:39:02 GMT
Author: sergeyb
Date: Mon Sep  2 12:39:01 2013
New Revision: 1519420

URL: http://svn.apache.org/r1519420
Log:
Merged revisions 1519419 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1519419 | sergeyb | 2013-09-02 13:35:10 +0100 (Mon, 02 Sep 2013) | 9 lines
  
  Merged revisions 1519418 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1519418 | sergeyb | 2013-09-02 13:33:00 +0100 (Mon, 02 Sep 2013) | 1 line
    
    Setting Jettison readNull property only if it is set to false
  ........
................

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:r1519419
  Merged /cxf/trunk:r1519418

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=1519420&r1=1519419&r2=1519420&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
Mon Sep  2 12:39:01 2013
@@ -153,7 +153,9 @@ public final class JSONUtils {
             conf.setPrimitiveArrayKeys(
                 new HashSet<String>(primitiveArrayKeys));
         }
-        conf.setReadNullAsEmptyString(readNullAsString);
+        if (!readNullAsString) {
+            conf.setReadNullAsEmptyString(readNullAsString);
+        }
         XMLInputFactory factory = depthProps != null 
             ? new JettisonMappedReaderFactory(conf, depthProps) 
             : new MappedXMLInputFactory(conf);



Mime
View raw message