commit 73ab22a6f1686dd3af777b496f5f8cba844b7efe
author Carsten Ziegeler <cziegeler@apache.org> Fri Aug 09 15:48:03 2013 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Fri Aug 09 15:48:03 2013 +0000
tree f35f05c205edd2549647e534dfcfcbfc7d628321
parent bcba9d94b6a130639a4e0c41794622cf27f2865d

SLING-3007 :  NPE in JSON Rendering if value map contains a null value 

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1512350 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java

diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java
index 0b1265c..aff19ba 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonObjectCreator.java
@@ -92,8 +92,10 @@
                 @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());
+                }
             }
         }