commit 01bf0a8c7a6d7089f80a92198553d559a825e73f
author Carsten Ziegeler <cziegeler@apache.org> Tue Apr 22 09:22:39 2014 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Tue Apr 22 09:22:39 2014 +0000
tree 29d5ee277833283465f39e1f248915888a3cb484
parent 564a3ecb3e374273aca77bcebd5489d7de4296f0

SLING-3507 : Potential NPE in JSON dump from JMX

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resource-inventory@1589049 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java

diff --git a/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java b/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java
index bbe022b..2516edc 100644
--- a/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java
+++ b/src/main/java/org/apache/sling/resource/inventory/impl/JsonObjectCreator.java
@@ -130,8 +130,10 @@
             return value;
         } else if ( value instanceof Double ) {
             return value;
-        } else {
+        } else if ( value != null ) {
             return value.toString();
+        } else {
+            return ""; // assume empty string
         }
     }