Fix non-unique module handler identifiers (#3592)

Signed-off-by: Jan N. Klug <github@klug.nrw>
openhab · May 5, 2023 · 28ec419 · 28ec419
1 parent d7ba8ad
commit 28ec419
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...utomation/src/main/java/org/openhab/core/automation/handler/BaseModuleHandlerFactory.java b/...utomation/src/main/java/org/openhab/core/automation/handler/BaseModuleHandlerFactory.java
@@ -60,7 +60,7 @@ protected Map<String, ModuleHandler> getHandlers() {
     @Override
     @SuppressWarnings("null")
     public @Nullable ModuleHandler getHandler(Module module, String ruleUID) {
-        String id = ruleUID + module.getId();
+        String id = getModuleIdentifier(ruleUID, module.getId());
         ModuleHandler handler = handlers.get(id);
         handler = handler == null ? internalCreate(module, ruleUID) : handler;
         if (handler != null) {
@@ -80,8 +80,12 @@ protected Map<String, ModuleHandler> getHandlers() {
 
     @Override
     public void ungetHandler(Module module, String ruleUID, ModuleHandler handler) {
-        if (handlers.remove(ruleUID + module.getId(), handler)) {
+        if (handlers.remove(getModuleIdentifier(ruleUID, module.getId()), handler)) {
             handler.dispose();
         }
     }
+
+    protected String getModuleIdentifier(String ruleUid, String moduleId) {
+        return ruleUid + "$" + moduleId;
+    }
 }
diff --git a/...in/java/org/openhab/core/automation/internal/composite/CompositeModuleHandlerFactory.java b/...in/java/org/openhab/core/automation/internal/composite/CompositeModuleHandlerFactory.java
@@ -92,7 +92,7 @@ public Collection<String> getTypes() {
     @SuppressWarnings({ "unchecked" })
     @Override
     public void ungetHandler(Module module, String childModulePrefix, ModuleHandler handler) {
-        ModuleHandler handlerOfModule = getHandlers().get(childModulePrefix + module.getId());
+        ModuleHandler handlerOfModule = getHandlers().get(getModuleIdentifier(childModulePrefix, module.getId()));
         if (handlerOfModule instanceof AbstractCompositeModuleHandler) {
             AbstractCompositeModuleHandler<ModuleImpl, ?, ?> h = (AbstractCompositeModuleHandler<ModuleImpl, ?, ?>) handlerOfModule;
             Set<ModuleImpl> modules = h.moduleHandlerMap.keySet();