Backport more fixes from mvn40 to mvn39 code

apache · Apr 6, 2023 · a15abc2 · a15abc2
1 parent 6bcb580
commit a15abc2
Showing 1 changed file with 2 additions and 2 deletions.
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
@@ -185,8 +185,7 @@ public DaemonMavenCli() throws Exception {
         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 @@ DefaultPlexusContainer container() throws Exception {
 
         List<File> extClassPath = Stream.of(
                         Environment.MVND_EXT_CLASSPATH.asString().split(","))
+                .filter(s -> s != null && !s.isEmpty())
                 .map(File::new)
                 .collect(Collectors.toList());