commit a15abc25dfea50cf1479307a2ac0af2db7730f68
author Stefan Oehme <st.oehme@gmail.com> Thu Mar 30 14:18:13 2023 +0200
committer Guillaume Nodet <gnodet@gmail.com> Thu Apr 06 15:30:16 2023 +0200
tree 67156de9eed5157a964494c0b787195960c59152
parent 6bcb580529e1b152c4a0b1e0b61eb650520ad025

Backport more fixes from mvn40 to mvn39 code

daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java

diff --git a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index 90de074..ebc4dba 100644
--- a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
@@ -185,8 +185,7 @@
         slf4jLogger = slf4jLoggerFactory.getLogger(this.getClass().getName());
         plexusLoggerManager = new Slf4jLoggerManager();
 
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        classWorld = new ClassWorld("plexus.core", cl);
+        this.classWorld = ((ClassRealm) Thread.currentThread().getContextClassLoader()).getWorld();
 
         container = container();
 
@@ -480,6 +479,7 @@
 
         List<File> extClassPath = Stream.of(
                         Environment.MVND_EXT_CLASSPATH.asString().split(","))
+                .filter(s -> s != null && !s.isEmpty())
                 .map(File::new)
                 .collect(Collectors.toList());