demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

[automation] Fixes NPE when no command is given in a member-of-group trigger (#1806)

Browse Source 
Fixes #1793 

Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer
2020-11-11 16:27:31 +01:00
committed by GitHub
parent 53af3c99ad
commit 48209e4a45
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GroupCommandTriggerHandler.java
+4 -4
View File
@@ -48,7 +48,7 @@ public class GroupCommandTriggerHandler extends BaseTriggerModuleHandler impleme
private final Logger logger = LoggerFactory.getLogger(GroupCommandTriggerHandler.class);
private final String groupName;
private final String command;
private final @Nullable String command;
private final String topic;
private final Set<String> types;
@@ -98,10 +98,10 @@ public class GroupCommandTriggerHandler extends BaseTriggerModuleHandler impleme
if (itemRegistry != null) {
Item item = itemRegistry.get(itemName);
if (item != null && item.getGroupNames().contains(groupName)) {
Command command = icEvent.getItemCommand();
if (this.command.equals(command.toFullString())) {
Command itemCommand = icEvent.getItemCommand();
if (command == null || command.equals(itemCommand.toFullString())) {
values.put("triggeringItem", item);
values.put("command", command);
values.put("command", itemCommand);
values.put("event", event);
cb.triggered(this.module, values);
}