Skip to content

armgit / core

Public Imported from GitHub
0

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

AgentService bug fix

Rich Turner34dfbe857665
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
index 8a684b18c..79c6ebc57 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -539,14 +539,15 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
}
protected String getAgentAncestorId(Asset asset) {
- //TODO: check whether getParentId can be null at this point
- if (asset.getParentId() != null) {
- return Arrays.stream(asset.getPath())
- .filter(assetId -> getAgents().containsKey(assetId))
- .findFirst()
- .orElse(null);
+ if (asset.getPath() == null) {
+ // Fully load
+ asset = assetStorageService.find(asset.getId());
}
- return null;
+
+ return Arrays.stream(asset.getPath())
+ .filter(assetId -> getAgents().containsKey(assetId))
+ .findFirst()
+ .orElse(null);
}
protected void linkProtocolConfigurations(List<AssetAttribute> configurations) {