From: Stefan Triller <t2000@users.noreply.github.com>
Date: Sun, 31 Jan 2021 20:59:22 +0000 (+0100)
Subject: [smartmeter] Fix NPE while trying to get ChannelType (#10007)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=f2ea9474249b87b638a5eece6febd6e2030af39d;p=openhab-addons.git

[smartmeter] Fix NPE while trying to get ChannelType (#10007)

Fixes #10006

Signed-off-by: Stefan Triller <github@stefantriller.de>
---

diff --git a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterChannelTypeProvider.java b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterChannelTypeProvider.java
index a5f1f3d240..7962f069c1 100644
--- a/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterChannelTypeProvider.java
+++ b/bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/SmartMeterChannelTypeProvider.java
@@ -107,6 +107,7 @@ public class SmartMeterChannelTypeProvider implements ChannelTypeProvider, Meter
      * @return The {@link ChannelTypeUID} or null.
      */
     public ChannelTypeUID getChannelTypeIdForObis(String obis) {
-        return obisChannelMap.get(obis).getUID();
+        ChannelType channeltype = obisChannelMap.get(obis);
+        return channeltype != null ? channeltype.getUID() : null;
     }
 }