Trigger rules without specific event on any event (#3366)

* Trigger rules without specific event on any event, Fixes #3362 * Simplified nested if Signed-off-by: Stefan Triller <stefan.triller@telekom.de>
eclipse-archived · May 4, 2017 · e320f02 · e320f02
1 parent 55fd9c9
commit e320f02
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...time/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerManager.java b/...time/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerManager.java
@@ -217,10 +217,11 @@ public Iterable<Rule> getRules(TriggerTypes triggerType, String channel, String
                     for (EventTrigger t : rule.getEventtrigger()) {
                         if (t instanceof EventEmittedTrigger) {
                             EventEmittedTrigger et = (EventEmittedTrigger) t;
-                            if (et.getTrigger() != null) {
-                                if (et.getChannel().equals(channel) && et.getTrigger().equals(event)) {
-                                    result.add(rule);
-                                }
+
+                            if (et.getChannel().equals(channel)
+                                    && (et.getTrigger() == null || et.getTrigger().equals(event))) {
+                                // if the rule does not have a specific event , execute it on any event
+                                result.add(rule);
                             }
                         }
                     }