svn commit: r925385 - in /shindig/trunk/java/common/src: main/java/org/apache/shindig/common/JsonSerializer.java test/java/org/apache/shindig/common/JsonSerializerTest.java

[johnh]

Author: johnh
Date: Fri Mar 19 19:18:17 2010
New Revision: 925385

URL: http://svn.apache.org/viewvc?rev=925385&view=rev
Log:
Handle JSONObject.NULL in JsonSerializer.

Patch provided by Marcel Prasetya.


Modified:
    
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
    
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java

Modified: 
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java?rev=925385&r1=925384&r2=925385&view=diff
==============================================================================
--- 
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
 (original)
+++ 
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
 Fri Mar 19 19:18:17 2010
@@ -142,7 +142,7 @@ public final class JsonSerializer {
    */
   @SuppressWarnings("unchecked")
   public static void append(Appendable buf, Object value) throws IOException {
-    if (value == null) {
+    if (value == null || value == JSONObject.NULL) {
       buf.append("null");
     } else if (value instanceof Number ||
                value instanceof Boolean) {

Modified: 
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java?rev=925385&r1=925384&r2=925385&view=diff
==============================================================================
--- 
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
 (original)
+++ 
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
 Fri Mar 19 19:18:17 2010
@@ -102,6 +102,12 @@ public class JsonSerializerTest {
   }
 
   @Test
+  public void serializeJsonObjectWithNullPropertyValue() throws Exception {
+    String json = "{foo:null}";
+    assertJsonEquals(json, JsonSerializer.serialize(new JSONObject(json)));
+  }
+
+  @Test
   public void serializePrimitives() throws Exception {
     assertEquals("null", JsonSerializer.serialize((Object) null));
     assertEquals("\"hello\"", JsonSerializer.serialize("hello"));