Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix for infinite expiry time on json rules

Michael Rademakerae6f18a4da96
diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
index 962c3b808..0c6a28035 100644
--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
@@ -573,8 +573,13 @@ public class JsonRulesBuilder extends RulesBuilder {
RuleConditionReset reset = ruleConditionState.ruleCondition.reset;
if (ruleConditionResetHasTimer(reset)) {
if (ruleConditionState.resetDurationMillis > 0) {
- ruleConditionState.lastTriggerResult.matchedAssetStates.forEach(assetState ->
- ruleConditionState.previouslyMatchedExpiryTimes.put(assetState, timerService.getCurrentTimeMillis() + ruleConditionState.resetDurationMillis));
+ if (ruleConditionState.resetDurationMillis == Long.MAX_VALUE) {
+ ruleConditionState.lastTriggerResult.matchedAssetStates.forEach(assetState ->
+ ruleConditionState.previouslyMatchedExpiryTimes.put(assetState, ruleConditionState.resetDurationMillis));
+ } else {
+ ruleConditionState.lastTriggerResult.matchedAssetStates.forEach(assetState ->
+ ruleConditionState.previouslyMatchedExpiryTimes.put(assetState, timerService.getCurrentTimeMillis() + ruleConditionState.resetDurationMillis));
+ }
}
}
if (ruleConditionState.trackUnmatched) {