demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-02-04 08:03:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

handle nullness in unget handler of composite module correctly (#878)

Browse Source 
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
This commit is contained in:
Markus Rathgeb 2019-06-20 21:22:22 +02:00 committed by Kai Kreuzer
parent f1dfb553c7
commit ebda4b8fc7
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/composite/CompositeModuleHandlerFactory.java
View File

@ -62,9 +62,9 @@ public class CompositeModuleHandlerFactory extends BaseModuleHandlerFactory impl
/** /**
* The constructor of system handler factory for composite module types. * The constructor of system handler factory for composite module types.
* *
* @param context is a bundle context * @param context is a bundle context
* @param mtManager is a module type manager * @param mtManager is a module type manager
* @param re is a rule engine * @param re is a rule engine
*/ */
public CompositeModuleHandlerFactory(ModuleTypeRegistry mtRegistry, RuleEngineImpl re) { public CompositeModuleHandlerFactory(ModuleTypeRegistry mtRegistry, RuleEngineImpl re) {
this.mtRegistry = mtRegistry; this.mtRegistry = mtRegistry;
@ -93,12 +93,16 @@ public class CompositeModuleHandlerFactory extends BaseModuleHandlerFactory impl
if (handlerOfModule instanceof AbstractCompositeModuleHandler) { if (handlerOfModule instanceof AbstractCompositeModuleHandler) {
AbstractCompositeModuleHandler<ModuleImpl, ?, ?> h = (AbstractCompositeModuleHandler<ModuleImpl, ?, ?>) handlerOfModule; AbstractCompositeModuleHandler<ModuleImpl, ?, ?> h = (AbstractCompositeModuleHandler<ModuleImpl, ?, ?>) handlerOfModule;
Set<ModuleImpl> modules = h.moduleHandlerMap.keySet(); Set<ModuleImpl> modules = h.moduleHandlerMap.keySet();
if (modules != null) { for (ModuleImpl child : modules) {
for (ModuleImpl child : modules) { ModuleHandler childHandler = h.moduleHandlerMap.get(child);
ModuleHandler childHandler = h.moduleHandlerMap.get(child); if (childHandler == null) {
ModuleHandlerFactory mhf = ruleEngine.getModuleHandlerFactory(child.getTypeUID()); continue;
mhf.ungetHandler(child, childModulePrefix + ":" + module.getId(), childHandler);
} }
ModuleHandlerFactory mhf = ruleEngine.getModuleHandlerFactory(child.getTypeUID());
if (mhf == null) {
continue;
}
mhf.ungetHandler(child, childModulePrefix + ":" + module.getId(), childHandler);
} }
} }
String ruleId = getRuleId(childModulePrefix); String ruleId = getRuleId(childModulePrefix);
@ -157,11 +161,11 @@ public class CompositeModuleHandlerFactory extends BaseModuleHandlerFactory impl
* properties and configuration of composite module see: * properties and configuration of composite module see:
* {@link ReferenceResolver#updateConfiguration(Configuration, Map, Logger)}. * {@link ReferenceResolver#updateConfiguration(Configuration, Map, Logger)}.
* *
* @param compositeConfig configuration values of composite module. * @param compositeConfig configuration values of composite module.
* @param childModules list of child modules * @param childModules list of child modules
* @param childModulePrefix defines UID of child module. The rule id is not enough for prefix when a composite type * @param childModulePrefix defines UID of child module. The rule id is not enough for prefix when a composite type
* is used more then one time in one and the same rule. For example the prefix can be: * is used more then one time in one and the same rule. For example the prefix can be:
* ruleId:compositeModuleId:compositeModileId2. * ruleId:compositeModuleId:compositeModileId2.
* @return map of pairs of module and its handler. Return null when some of the child modules can not find its * @return map of pairs of module and its handler. Return null when some of the child modules can not find its
* handler. * handler.
*/ */