Skip to content

armgit / core

Public Imported from GitHub
0

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

Bug fix for JsonRulesBuilder

Rich Turnereb0c320e4088
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 04913ae24..bca8debea 100644
--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
@@ -308,7 +308,7 @@ public class JsonRulesBuilder extends RulesBuilder {
});
}
- if (ruleCondition.reset.timestampChanges) {
+ if (ruleCondition.reset != null && ruleCondition.reset.timestampChanges) {
previouslyMatchedAssetStates.removeIf(previousAssetState -> {
int index = matchedAssetStates.indexOf(previousAssetState);
if (index < 0) {