Small changes from #10090.

Signed-off-by: Simone Bordet <[email protected]>
jetty · Jul 14, 2023 · 9a476e2 · 9a476e2
1 parent 0879f6b
commit 9a476e2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -554,9 +554,10 @@ public CommandLineBuilder getMainArgs(Set<String> parts) throws IOException
 
         if (parts.contains("path"))
         {
+            Classpath classpath = jettyEnvironment.getClasspath();
             if (isJPMS())
             {
-                Map<Boolean, List<Path>> dirsAndFiles = StreamSupport.stream(jettyEnvironment.getClasspath().spliterator(), false)
+                Map<Boolean, List<Path>> dirsAndFiles = StreamSupport.stream(classpath.spliterator(), false)
                     .collect(Collectors.groupingBy(Files::isDirectory));
 
                 List<Path> paths = dirsAndFiles.get(false);
@@ -605,10 +606,10 @@ public CommandLineBuilder getMainArgs(Set<String> parts) throws IOException
 
                 generateJpmsArgs(cmd);
             }
-            else
+            else if (!classpath.isEmpty())
             {
                 cmd.addOption("--class-path");
-                cmd.addArg(jettyEnvironment.getClasspath().toString());
+                cmd.addArg(classpath.toString());
             }
         }
 
@@ -685,7 +686,7 @@ else if (properties.size() > 0)
                 // TODO module path
 
                 for (Prop property : environment.getProperties())
-                    cmd.addArg(property.key + "=" + property.value);
+                    cmd.addArg(property.key, property.value);
 
                 for (Path xmlFile : environment.getXmlFiles())
                     cmd.addArg(xmlFile.toAbsolutePath().toString());