From: lsiepel <leosiepel@gmail.com>
Date: Mon, 16 Sep 2024 11:32:10 +0000 (+0200)
Subject: [unifi] Fix `NullPointerException` (#17421)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=753be5b24bb35bac3e6c014fc15e4e991249322a;p=openhab-addons.git

[unifi] Fix `NullPointerException` (#17421)

* Fix NPE
* Null warning

Signed-off-by: Leo Siepel <leosiepel@gmail.com>
---

diff --git a/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiPoePortThingHandler.java b/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiPoePortThingHandler.java
index f3e34f054c..0bfbef8a1e 100644
--- a/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiPoePortThingHandler.java
+++ b/bundles/org.openhab.binding.unifi/src/main/java/org/openhab/binding/unifi/internal/handler/UniFiPoePortThingHandler.java
@@ -89,7 +89,8 @@ public class UniFiPoePortThingHandler extends UniFiBaseThingHandler<UniFiSwitchP
         } else {
             final String channelConfigPoeEnableMode = (String) channel.getConfiguration()
                     .get(CHANNEL_ENABLE_PARAMETER_MODE);
-            poeEnableMode = channelConfigPoeEnableMode.isBlank() ? CHANNEL_ENABLE_PARAMETER_MODE_AUTO
+            poeEnableMode = channelConfigPoeEnableMode == null || channelConfigPoeEnableMode.isBlank()
+                    ? CHANNEL_ENABLE_PARAMETER_MODE_AUTO
                     : channelConfigPoeEnableMode;
             return true;
         }
@@ -139,7 +140,7 @@ public class UniFiPoePortThingHandler extends UniFiBaseThingHandler<UniFiSwitchP
         return state;
     }
 
-    private <Q extends Quantity<Q>> State safeDouble(final String value, final Unit<Q> unit) {
+    private <Q extends Quantity<Q>> State safeDouble(@Nullable final String value, final Unit<Q> unit) {
         try {
             return value == null ? UnDefType.UNDEF : QuantityType.valueOf(Double.parseDouble(value), unit);
         } catch (final NumberFormatException e) {