From c5b68d024889fa228503109e0bcbf2e269c9a6be Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sun, 18 Dec 2022 23:22:40 +0100 Subject: [PATCH] Fix NullPointerException (#14010) Fixes #13961 Signed-off-by: Jacob Laursen --- .../internal/provider/ShellyChannelDefinitions.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/provider/ShellyChannelDefinitions.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/provider/ShellyChannelDefinitions.java index 0d27bae8eb24e..f5d1177b65666 100644 --- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/provider/ShellyChannelDefinitions.java +++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/provider/ShellyChannelDefinitions.java @@ -344,10 +344,10 @@ public static Map createRelayChannels(final Thing thing, final } // Shelly 1/1PM and Plus 1/1PM Addon - addChannel(thing, add, - profile.settings.extSwitch != null && profile.settings.extSwitch.input0 != null - && idx == getInteger(profile.settings.extSwitch.input0.relayNum), - CHGR_SENSOR, CHANNEL_ESENSOR_INPUT + (profile.settings.extSwitch.input0.relayNum + 1)); + if (profile.settings.extSwitch != null && profile.settings.extSwitch.input0 != null + && idx == getInteger(profile.settings.extSwitch.input0.relayNum)) { + addChannel(thing, add, true, CHGR_SENSOR, CHANNEL_ESENSOR_INPUT + (idx + 1)); + } if (profile.status.extTemperature != null) { addChannel(thing, add, profile.status.extTemperature.sensor1 != null, CHGR_SENSOR, CHANNEL_ESENSOR_TEMP1); addChannel(thing, add, profile.status.extTemperature.sensor2 != null, CHGR_SENSOR, CHANNEL_ESENSOR_TEMP2);