svn commit: r1512350 - /sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java

[cziegeler]

Author: cziegeler
Date: Fri Aug  9 15:48:03 2013
New Revision: 1512350

URL: http://svn.apache.org/r1512350
Log:
SLING-3007 :  NPE in JSON Rendering if value map contains a null value 

Modified:
    
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java

Modified: 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java?rev=1512350&r1=1512349&r2=1512350&view=diff
==============================================================================
--- 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java
 (original)
+++ 
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java
 Fri Aug  9 15:48:03 2013
@@ -92,8 +92,10 @@ public abstract class JsonObjectCreator 
                 @SuppressWarnings("unchecked")
                 final Map.Entry prop = props.next();
 
-                createProperty(obj, valueMap, prop.getKey().toString(),
-                    prop.getValue());
+                if ( prop.getValue() != null ) {
+                    createProperty(obj, valueMap, prop.getKey().toString(),
+                        prop.getValue());
+                }
             }
         }