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 notifying consoles about geofence updates

Michael Rademaker58c05620461f
diff --git a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java
index 8c1df038c..1c3dcab6b 100644
--- a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java
@@ -132,7 +132,7 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe
consoleParent = new Asset(CONSOLE_PARENT_ASSET_NAME, AssetType.THING);
consoleParent.setId(id);
consoleParent.setRealm(tenant.getRealm());
- assetStorageService.merge(consoleParent);
+ consoleParent = assetStorageService.merge(consoleParent);
}
return consoleParent;
}
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 8879d2e41..f7d73dc69 100644
--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
@@ -81,7 +81,6 @@ public class JsonRulesBuilder extends RulesBuilder {
static class RuleTriggerState {
final TimerService timerService;
- boolean notifiedLocationPredicates;
boolean trackUnmatched;
BaseAssetQuery.OrderBy orderBy;
int limit;
@@ -153,10 +152,9 @@ public class JsonRulesBuilder extends RulesBuilder {
unfilteredAssetStates = facts.matchAssetState(query).collect(Collectors.toSet());
// Use this opportunity to notify RulesFacts about any location predicates
- if (!notifiedLocationPredicates) {
+ if (facts.trackLocationRules) {
List<AttributePredicate> flattenedAttributePredicates = RuleCondition.flatten(Collections.singletonList(attributePredicates));
facts.storeLocationPredicates(getLocationPredicates(flattenedAttributePredicates));
- notifiedLocationPredicates = true;
}
}
}