fix NPE in Configuration.toString() (eclipse-archived#3169)

fixes eclipse-archived#3167 Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
sjsf · Mar 22, 2017 · 034ba55 · 034ba55
1 parent 4f7ec52
commit 034ba55
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...core.test/src/test/groovy/org/eclipse/smarthome/config/core/test/ConfigurationTest.groovy b/...core.test/src/test/groovy/org/eclipse/smarthome/config/core/test/ConfigurationTest.groovy
@@ -89,4 +89,14 @@ class ConfigurationTest {
 
         assertThat configuration.get("intField"), is(equalTo(null))
     }
+
+    @Test
+    void 'assert toString handles null values gracefully'() {
+        def properties = new HashMap([
+            stringField: null
+        ]);
+        def configuration = new Configuration(properties)
+        def res = configuration.toString()
+        assertThat res.contains("type=?"), is(true)
+    }
 }
diff --git a/....smarthome.config.core/src/main/java/org/eclipse/smarthome/config/core/Configuration.java b/....smarthome.config.core/src/main/java/org/eclipse/smarthome/config/core/Configuration.java
@@ -221,7 +221,7 @@ public String toString() {
                 sb.append(", ");
             }
             sb.append(String.format("{key=%s; type=%s; value=%s}", prop.getKey(),
-                    prop.getValue().getClass().getSimpleName(), prop.getValue()));
+                    prop.getValue() != null ? prop.getValue().getClass().getSimpleName() : "?", prop.getValue()));
         }
         sb.append("]");
         return sb.toString();