From a9f440dba22d649d3b1e149adfc70d7817c69dbd Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Fri, 19 Feb 2021 19:16:26 +0000
Subject: [PATCH] [hue] Eliminate NPE in #9985 (#10199)
* [hue] extra null check
Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
.../internal/discovery/HueBridgeDiscoveryParticipant.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
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 d5bb4ce49..7018c6291 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