]> git.basschouten.com Git - openhab-addons.git/commitdiff
[miio] Check for null properties (#9408)
authorMark Hilbush <mark@hilbush.com>
Fri, 18 Dec 2020 01:41:28 +0000 (20:41 -0500)
committerGitHub <noreply@github.com>
Fri, 18 Dec 2020 01:41:28 +0000 (17:41 -0800)
Signed-off-by: Mark Hilbush <mark@hilbush.com>
bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java

index 7715de5649ddd6145b6d0577ac952d44023ca627..d18af7762120e98a0842526a46c1dfa9133ed96e 100644 (file)
@@ -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) {