MNG-7402 - BuildListCalculator never detaches the classloader

apache · Feb 25, 2022 · 738b44a · 738b44a
1 parent 395411f
commit 738b44a
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
@@ -55,12 +55,20 @@ public ProjectBuildList calculateProjectBuilds( MavenSession session, List<TaskS
             {
                 projects = session.getProjects();
             }
-            for ( MavenProject project : projects )
+            ClassLoader ccl = Thread.currentThread().getContextClassLoader();
+            try
             {
-                BuilderCommon.attachToThread( project ); // Not totally sure if this is needed for anything
-                MavenSession copiedSession = session.clone();
-                copiedSession.setCurrentProject( project );
-                projectBuilds.add( new ProjectSegment( project, taskSegment, copiedSession ) );
+                for ( MavenProject project : projects )
+                {
+                    BuilderCommon.attachToThread( project ); // Not totally sure if this is needed for anything
+                    MavenSession copiedSession = session.clone();
+                    copiedSession.setCurrentProject( project );
+                    projectBuilds.add( new ProjectSegment( project, taskSegment, copiedSession ) );
+                }
+            }
+            finally
+            {
+                Thread.currentThread().setContextClassLoader( ccl );
             }
         }
         return new ProjectBuildList( projectBuilds );