diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-01-04 14:45:47 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2022-01-04 14:45:47 +0100 |
| commit | 7ea14b85e95ebe334f14d3ac646db99504ae7d44 (patch) | |
| tree | 8a08dc7ed25bc35fdb169a1a9fe955b439810e4a /config-model | |
| parent | e89d9b57acfca329c7013b5ca4a6099b7bdffae3 (diff) | |
Allow / in JVM options
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java | 2 |
2 files changed, 2 insertions, 2 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 7f0948cccda..7f9364f904f 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 @@ -1063,7 +1063,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { private static class JvmOptions { - private static final Pattern validPattern = Pattern.compile("-[a-zA-z0-9=:.]+"); + private static final Pattern validPattern = Pattern.compile("-[a-zA-z0-9=:./]+"); private final ContainerCluster<?> cluster; private final Element nodesElement; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java index 8b41ab145ec..96fbce03e88 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java @@ -246,7 +246,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase { // Valid options, should not log anything verifyLoggingOfJvmOptions(true, "options", "-Xms2G"); verifyLoggingOfJvmOptions(true, "options", "-verbose:gc"); - verifyLoggingOfJvmOptions(true, "options", "-Dvespa.freezedetector.disable=true"); + verifyLoggingOfJvmOptions(true, "options", "-Djava.library.path=/opt/vespa/lib64:/home/y/lib64"); verifyLoggingOfJvmOptions(false, "options", "-Xms2G"); } |