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 RulesEngine error evaluation

Michael Rademakerebc8603ac1cb
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
index 8d2253145..51b430bf0 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
@@ -160,7 +160,8 @@ public class RulesEngine<T extends Ruleset> {
public boolean isError() {
for (RulesetDeployment deployment : deployments.values()) {
- if (deployment.status == COMPILATION_ERROR || deployment.getStatus() == EXECUTION_ERROR) {
+ if (((deployment.status == COMPILATION_ERROR || deployment.getStatus() == EXECUTION_ERROR) &&
+ !deployment.getRuleset().isContinueOnError()) || deployment.error instanceof RulesLoopException) {
return true;
}
}
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
index 4b79002df..6dd1d06ce 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
@@ -249,7 +249,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
assert tenantAEngine.isRunning()
assert tenantAEngine.deployments.size() == 3
assert tenantAEngine.deployments[ruleset.id].status == EXECUTION_ERROR
- assert tenantAEngine.isError()
+ assert !tenantAEngine.isError()
}
when: "a new tenant rule definition is added to Tenant A"