summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2024-01-24 14:49:38 +0100
committerGitHub <noreply@github.com>2024-01-24 14:49:38 +0100
commit6409bbff8d605c12466d8bc39b0caf67b13c3aa9 (patch)
tree5b903f7eb6d6b786bda3214a6e722889af6d361c
parenta4443b6bbe8aacb96c793622f6cae44fc4e41ef5 (diff)
parent6cdde39eba5224aecfc0f4fc17c59f4a138504f0 (diff)
Merge pull request #30046 from vespa-engine/jonmv/throw-on-malformed-json
Throw so we get a proper error logged when patching with invalid JSON
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
index 93160bf7689..dc70af9a84f 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
@@ -95,7 +95,7 @@ public class NodePatcher {
}
private void unifiedPatch(String hostname, InputStream json, boolean untrustedTenantHost) {
- Inspector root = Exceptions.uncheck(() -> SlimeUtils.jsonToSlime(json.readAllBytes())).get();
+ Inspector root = Exceptions.uncheck(() -> SlimeUtils.jsonToSlimeOrThrow(json.readAllBytes())).get();
Map<String, Inspector> fields = new HashMap<>();
root.traverse(fields::put);