You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by se...@apache.org on 2011/10/03 12:09:48 UTC

svn commit: r1178368 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java

Author: sergeyb
Date: Mon Oct  3 10:09:47 2011
New Revision: 1178368

URL: http://svn.apache.org/viewvc?rev=1178368&view=rev
Log:
Updating JSONUtils to check xsi:nil too

Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java?rev=1178368&r1=1178367&r2=1178368&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java Mon Oct  3 10:09:47 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);