Skip to content

armgit / core

Public Imported from GitHub
0

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

Check for null response from HealthStatusProvider (#1602)

Rich Turner8979b480b84c
diff --git a/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java
index 2e95e13b4..5d5a82bf9 100644
--- a/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java
@@ -19,6 +19,7 @@
*/
package org.openremote.manager.system;
+import com.fasterxml.jackson.databind.node.NullNode;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.model.Container;
import org.openremote.model.system.HealthStatusProvider;
@@ -74,7 +75,8 @@ public class StatusResourceImpl implements StatusResource {
Map<String, Object> objectValue = new HashMap<>();
healthStatusProviderList.forEach(healthStatusProvider -> {
- Map<String, Object> providerValue = Map.of("data", healthStatusProvider.getHealthStatus());
+ Object healthStatus = healthStatusProvider.getHealthStatus();
+ Map<String, Object> providerValue = Map.of("data", healthStatus != null ? healthStatus : NullNode.getInstance());
objectValue.put(healthStatusProvider.getHealthStatusName(), providerValue);
}
);