From: Mark Hilbush <mark@hilbush.com>
Date: Fri, 18 Dec 2020 01:41:28 +0000 (-0500)
Subject: [miio] Check for null properties (#9408)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=74bdcb6e85c3217683a867135ff8be679c88f812;p=openhab-addons.git

[miio] Check for null properties (#9408)

Signed-off-by: Mark Hilbush <mark@hilbush.com>
---

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java
index 7715de5649..d18af77621 100644
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java
@@ -95,11 +95,16 @@ public class MiIoDiscovery extends AbstractDiscoveryService {
         if (miioConfig != null) {
             try {
                 Dictionary<String, @Nullable Object> properties = miioConfig.getProperties();
-                String cloudDiscoveryModeConfig = (String) properties.get("cloudDiscoveryMode");
-                if (cloudDiscoveryModeConfig == null) {
+                String cloudDiscoveryModeConfig;
+                if (properties == null) {
                     cloudDiscoveryModeConfig = DISABLED;
                 } else {
-                    cloudDiscoveryModeConfig = cloudDiscoveryModeConfig.toLowerCase();
+                    cloudDiscoveryModeConfig = (String) properties.get("cloudDiscoveryMode");
+                    if (cloudDiscoveryModeConfig == null) {
+                        cloudDiscoveryModeConfig = DISABLED;
+                    } else {
+                        cloudDiscoveryModeConfig = cloudDiscoveryModeConfig.toLowerCase();
+                    }
                 }
                 return Set.of(SUPPORTED, ALL).contains(cloudDiscoveryModeConfig) ? cloudDiscoveryModeConfig : DISABLED;
             } catch (ClassCastException | SecurityException e) {