svn commit: r1504430 - /cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java

[sergeyb]

Author: sergeyb
Date: Thu Jul 18 11:14:05 2013
New Revision: 1504430

URL: http://svn.apache.org/r1504430
Log:
Call new Jettison Configuration only if requested by a user - should let reuse 
older Jettisons if no new properties are used

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

Modified: 
cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java?rev=1504430&r1=1504429&r2=1504430&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
 (original)
+++ 
cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
 Thu Jul 18 11:14:05 2013
@@ -518,8 +518,12 @@ public class JSONProvider<T> extends Abs
         if (!dropElementsInXmlStream && super.outDropElements != null) {
             config.setIgnoredElements(outDropElements);
         }
-        config.setWriteNullAsString(writeNullAsString);
-        config.setDropRootElement(dropRootElement && !dropElementsInXmlStream);
+        if (!writeNullAsString) {
+            config.setWriteNullAsString(writeNullAsString);
+        }
+        if (dropRootElement && !dropElementsInXmlStream) {
+            config.setDropRootElement(true);
+        }
         if (ignoreNamespaces && serializeAsArray && arrayKeys == null) {
             arrayKeys = 
CastUtils.cast((List<?>)Collections.singletonList(qname.getLocalPart()));
         }