From 84ee447e6620ce933f0fc4c191f9ce4d7fc142a6 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 30 Jun 2023 14:59:52 +1000 Subject: [PATCH] do not automatically quote system properties containing spaces Signed-off-by: Lachlan Roberts --- .../src/main/java/org/eclipse/jetty/start/Main.java | 2 +- .../jetty/tests/distribution/DistributionTests.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java index 425805d8e50e..0dcfa3527b7a 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java @@ -441,7 +441,7 @@ public void start(StartArgs args) throws IOException, InterruptedException { CommandLineBuilder cmd = args.getMainArgs(args.getDryRunParts()); cmd.debug(); - System.out.println(cmd.toQuotedString()); + System.out.println(cmd); } if (args.isStopCommand()) diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 00d5e8c5cbec..48c10913c0f3 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -1308,13 +1308,17 @@ public void testDryRunProperties() throws Exception assertTrue(run1.awaitFor(10, TimeUnit.SECONDS)); assertEquals(0, run1.getExitValue()); - String[] args2 = {"--dry-run"}; + String systemProp = "-Dtest=\"foo bar\""; + String[] args2 = {systemProp, "--dry-run"}; try (JettyHomeTester.Run run2 = distribution.start(args2)) { run2.awaitFor(5, TimeUnit.SECONDS); Queue logs = run2.getLogs(); assertThat(logs.size(), equalTo(1)); - assertThat(logs.poll(), not(containsString("${jetty.home.uri}"))); + String log = logs.poll(); + assertThat(log, not(containsString("${jetty.home.uri}"))); + assertThat(log, not(containsString("'" + systemProp))); + assertThat(log, containsString(systemProp)); } } }