diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-06-16 11:11:13 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-06-16 11:11:13 +0200 |
commit | e1400532f51afdccc5a4e1f9edd3b05a8ffb5ca0 (patch) | |
tree | 9c961f803326ca43478a9099cdae071dfd0f9773 /node-admin | |
parent | 1c7328f5d6d08388d5a602864af9a1da280b2e40 (diff) |
remove report if null value
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeReports.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeReports.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeReports.java index 2b3024f6cee..d3ab6464822 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeReports.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeReports.java @@ -77,10 +77,12 @@ public class NodeReports { return new TreeMap<>(reports); } - /** Set or overwrite the reports of {@code this} that are found in {@code override}. */ + /** Apply the override to this. null value means removing report. */ public void updateFromRawMap(Map<String, JsonNode> override) { override.forEach((reportId, jsonNode) -> { - if (jsonNode != null) { + if (jsonNode == null) { + reports.remove(reportId); + } else { reports.put(reportId, jsonNode); } }); |