aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/vespa/model/container
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2021-12-21 12:49:38 +0100
committerHarald Musum <musum@yahooinc.com>2021-12-21 12:49:38 +0100
commit245235fe4fd73749004b7ffec63d7f429ffd5812 (patch)
tree5057a90e8eeb6d4e851529d4656597c564569203 /config-model/src/main/java/com/yahoo/vespa/model/container
parent604414a23c3a4f12de05d6808a45db83a569198c (diff)
Return early if no invliad options
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 70d01f104dd..d8be21e75e0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -1132,6 +1132,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
.sorted()
.collect(Collectors.toList());
+ if (invalidOptions.isEmpty()) return;
+
String message = "Invalid JVM options in services.xml: " + String.join(",", invalidOptions);
if (failDeploymentWithInvalidJvmOptions)
throw new IllegalArgumentException(message);