DynamicStateDescriptionProvider improvements (openhab#5957)

Don't return originalStateDescription as the service code depends on it being null if the specific provider called isn't handling the channel. See openhab#3619 Signed-off-by: Hilbrand Bouwkamp <[email protected]>
Pshatsillo · Dec 8, 2019 · 2853afd · 2853afd
1 parent 15332d6
commit 2853afd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...mazonechocontrol/internal/statedescription/AmazonEchoDynamicStateDescriptionProvider.java b/...mazonechocontrol/internal/statedescription/AmazonEchoDynamicStateDescriptionProvider.java
@@ -102,7 +102,7 @@ protected void unsetThingRegistry(ThingRegistry thingRegistry) {
         }
         ThingRegistry thingRegistry = this.thingRegistry;
         if (thingRegistry == null) {
-            return originalStateDescription;
+            return null;
         }
         if (CHANNEL_TYPE_BLUETHOOTH_MAC.equals(channel.getChannelTypeUID())) {
             EchoHandler handler = (EchoHandler) findHandler(channel);
@@ -266,6 +266,6 @@ protected void unsetThingRegistry(ThingRegistry thingRegistry) {
                     .withOptions(options).build().toStateDescription();
             return result;
         }
-        return originalStateDescription;
+        return null;
     }
 }
diff --git a/...src/main/java/org/openhab/binding/onewire/internal/OwDynamicStateDescriptionProvider.java b/...src/main/java/org/openhab/binding/onewire/internal/OwDynamicStateDescriptionProvider.java
@@ -72,7 +72,7 @@ public void removeDescriptionsForThing(ThingUID thingUID) {
             logger.trace("returning new stateDescription for {}", channel.getUID());
             return descriptions.get(channel.getUID());
         } else {
-            return originalStateDescription;
+            return null;
         }
     }
 }