svn commit: r1178369 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java

[sergeyb]

Author: sergeyb
Date: Mon Oct  3 10:11:39 2011
New Revision: 1178369

URL: http://svn.apache.org/viewvc?rev=1178369&view=rev
Log:
Merged revisions 1178368 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1178368 | sergeyb | 2011-10-03 11:09:47 +0100 (Mon, 03 Oct 2011) | 1 line
  
  Updating JSONUtils to check xsi:nil too
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct  3 10:11:39 2011
@@ -1 +1 @@
-/cxf/trunk:1177618,1177631
+/cxf/trunk:1177618,1177631,1178368

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

Modified: 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java?rev=1178369&r1=1178368&r2=1178369&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
 Mon Oct  3 10:11:39 2011
@@ -201,7 +201,8 @@ public final class JSONUtils {
         
         public void writeAttribute(String prefix, String uri,
                                    String local, String value) throws 
XMLStreamException {
-            if (!writeXsiType && "type".equals(local) && "xsi".equals(prefix)) 
{
+            if (!writeXsiType && "xsi".equals(prefix)
+                    && ("type".equals(local) || "nil".equals(local))) {
                 return;
             }
             super.writeAttribute(prefix, uri, local, value);