cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1178370 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
Date Mon, 03 Oct 2011 10:13:53 GMT
Author: sergeyb
Date: Mon Oct  3 10:13:53 2011
New Revision: 1178370

URL: http://svn.apache.org/viewvc?rev=1178370&view=rev
Log:
Merged revisions 1178369 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1178369 | sergeyb | 2011-10-03 11:11:39 +0100 (Mon, 03 Oct 2011) | 9 lines
  
  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.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct  3 10:13:53 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1172584,1173057,1173766,1174040,1174408,1175846,1175943,1175953,1176842,1176859,1177165,1177283
-/cxf/trunk:1172522,1173027,1173997-1173998,1174404,1175747-1175780,1175939,1175951,1176840,1176856,1177164,1177282
+/cxf/branches/2.4.x-fixes:1172584,1173057,1173766,1174040,1174408,1175846,1175943,1175953,1176842,1176859,1177165,1177283,1178369
+/cxf/trunk:1172522,1173027,1173997-1173998,1174404,1175747-1175780,1175939,1175951,1176840,1176856,1177164,1177282,1178368

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

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java?rev=1178370&r1=1178369&r2=1178370&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONUtils.java
Mon Oct  3 10:13:53 2011
@@ -200,7 +200,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);



Mime
View raw message