Skip to content

armgit / core

Public Imported from GitHub
0

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

Small fix for NullPointer in AgentService Close response in HttpClientProtocol when exception is thrown

Michael Rademaker1d40169a0118
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
index 73afeb7f8..0e2771f46 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientProtocol.java
@@ -1183,6 +1183,9 @@ public class HttpClientProtocol extends AbstractProtocol {
response = clientRequest.invoke(valueStr);
} catch (Exception e) {
LOG.log(Level.SEVERE, "Exception thrown whilst doing attribute write request", e);
+ if (response != null) {
+ response.close();
+ }
}
responseConsumer.accept(response);
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 fb128d2d5..91dbe5837 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -539,10 +539,14 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
}
protected String getAgentAncestorId(Asset asset) {
- return Arrays.stream(asset.getPath())
- .filter(assetId -> getAgents().containsKey(assetId))
- .findFirst()
- .orElse(null);
+ //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);
+ }
+ return null;
}
protected void linkProtocolConfigurations(List<AssetAttribute> configurations) {