svn commit: r1519419 - in /cxf/branches/2.7.x-fixes: ./ rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java

[sergeyb]

Author: sergeyb
Date: Mon Sep  2 12:35:10 2013
New Revision: 1519419

URL: http://svn.apache.org/r1519419
Log:
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.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1519418

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.7.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.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java?rev=1519419&r1=1519418&r2=1519419&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
 Mon Sep  2 12:35:10 2013
@@ -152,7 +152,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);