svn commit: r668271 - in /incubator/shindig/trunk/java/social-api/src: main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java

[doll]

Author: doll
Date: Mon Jun 16 12:37:00 2008
New Revision: 668271

URL: http://svn.apache.org/viewvc?rev=668271&view=rev
Log:
SHINDIG-384
Null values in a map (found when fetching app data with a null value) no longer 
cause exceptions when serializing to json. 




Modified:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java?rev=668271&r1=668270&r2=668271&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
 Mon Jun 16 12:37:00 2008
@@ -101,7 +101,8 @@
         || val instanceof Enum
         || val instanceof Float
         || val instanceof JSONObject
-        || val instanceof JSONArray) {
+        || val instanceof JSONArray
+        || val == null) {
       return val;
     }
 

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=668271&r1=668270&r2=668271&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
 Mon Jun 16 12:37:00 2008
@@ -142,6 +142,9 @@
 
     Map<String, String> item1Map = Maps.newHashMap();
     item1Map.put("value", "1");
+    
+    // Null values shouldn't cause exceptions
+    item1Map.put("value2", null);
     map.put("item1", item1Map);
 
     Map<String, String> item2Map = Maps.newHashMap();