Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small changes from #10090. 

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2023-07-14 18:09:35 +02:00
parent 0879f6bc85
commit 9a476e2c0c
No known key found for this signature in database
GPG Key ID: 1677D141BCF3584D
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -554,9 +554,10 @@ public class StartArgs
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 class StartArgs
generateJpmsArgs(cmd);
}
else
else if (!classpath.isEmpty())
{
cmd.addOption("--class-path");
cmd.addArg(jettyEnvironment.getClasspath().toString());
cmd.addArg(classpath.toString());
}
}
@ -685,7 +686,7 @@ public class StartArgs
// 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());