From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Fri, 19 Feb 2021 19:16:26 +0000 (+0000)
Subject: [hue] Eliminate NPE in #9985 (#10199)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=a9f440dba22d649d3b1e149adfc70d7817c69dbd;p=openhab-addons.git

[hue] Eliminate NPE in #9985 (#10199)

* [hue] extra null check

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---

diff --git a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeDiscoveryParticipant.java b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeDiscoveryParticipant.java
index d5bb4ce498..7018c62917 100644
--- a/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeDiscoveryParticipant.java
+++ b/bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeDiscoveryParticipant.java
@@ -119,9 +119,11 @@ public class HueBridgeDiscoveryParticipant implements UpnpDiscoveryParticipant {
         try {
             Configuration conf = configAdmin.getConfiguration("binding.hue");
             Dictionary<String, @Nullable Object> properties = conf.getProperties();
-            Object property = properties.get(HueBindingConstants.REMOVAL_GRACE_PERIOD);
-            if (property != null) {
-                removalGracePeriodSeconds = Long.parseLong(property.toString());
+            if (properties != null) {
+                Object property = properties.get(HueBindingConstants.REMOVAL_GRACE_PERIOD);
+                if (property != null) {
+                    removalGracePeriodSeconds = Long.parseLong(property.toString());
+                }
             }
         } catch (IOException | IllegalStateException | NumberFormatException e) {
             // fall through to pre-initialised (default) value