From f9d2095d9c2fd72096908bc70bac7850c86db805 Mon Sep 17 00:00:00 2001 From: Kristian Aune Date: Wed, 31 Aug 2022 22:32:44 +0200 Subject: Add * to valid jvm pattern for debug port self-hosted --- .../java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fc8a542b81c..00bd57784f3 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 @@ -1037,7 +1037,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder { */ 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=:./,+-*]+"); // debug port will not be available in hosted, don't allow private static final Pattern invalidInHostedatttern = Pattern.compile("-Xrunjdwp:transport=.*"); -- cgit v1.2.3 From 0304cfc82debbfbaf4dc3375cbf4c6c357e61422 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 1 Sep 2022 08:19:20 +0200 Subject: Move - to end of list of characters, as - otherwise is used as range --- .../java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 00bd57784f3..1cf73c1ed03 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 @@ -1037,7 +1037,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder { */ 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=:./,+*-]+"); // debug port will not be available in hosted, don't allow private static final Pattern invalidInHostedatttern = Pattern.compile("-Xrunjdwp:transport=.*"); -- cgit v1.2.3