From b4945f647c2f0f8700b5c6cd9fbb60d581e10d79 Mon Sep 17 00:00:00 2001 From: lolodomo Date: Thu, 5 May 2022 20:13:59 +0200 Subject: [PATCH] [somfytahoma] Ignore disabled things (#12687) * [somfytahoma] Ignore disabled things Signed-off-by: Laurent Garnier --- .../internal/handler/SomfyTahomaBridgeHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java index 64203ffb6..950146b52 100644 --- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java +++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBridgeHandler.java @@ -451,7 +451,7 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler { boolean needsUpdate = reconciliation; for (Thing th : getThing().getThings()) { - if (ThingStatus.ONLINE != th.getStatus()) { + if (th.isEnabled() && ThingStatus.ONLINE != th.getStatus()) { needsUpdate = true; } } @@ -519,7 +519,7 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler { private void processGatewayEvent(SomfyTahomaEvent event) { // update gateway status for (Thing th : getThing().getThings()) { - if (THING_TYPE_GATEWAY.equals(th.getThingTypeUID())) { + if (th.isEnabled() && THING_TYPE_GATEWAY.equals(th.getThingTypeUID())) { SomfyTahomaGatewayHandler gatewayHandler = (SomfyTahomaGatewayHandler) th.getHandler(); if (gatewayHandler != null && gatewayHandler.getGateWayId().equals(event.getGatewayId())) { gatewayHandler.refresh(STATUS); @@ -567,7 +567,7 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler { handler.updateThingChannels(states); } } else { - logger.debug("Thing handler is null, probably not bound thing."); + logger.debug("Thing is disabled or handler is null, probably not bound thing."); } } @@ -588,6 +588,9 @@ public class SomfyTahomaBridgeHandler extends BaseBridgeHandler { private @Nullable Thing getThingByDeviceUrl(String deviceUrl) { for (Thing th : getThing().getThings()) { + if (!th.isEnabled()) { + continue; + } String url = (String) th.getConfiguration().get("url"); if (deviceUrl.equals(url)) { return th;