[MNG-7402] BuildListCalculator never detaches the classloader

This closes #683
apache · Feb 26, 2022 · d29af90 · gnodet · Feb 28, 2022 · michael-o
1 parent 395411f
commit d29af90
Showing 1 changed file with 12 additions and 4 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
@@ -57,10 +57,18 @@ public ProjectBuildList calculateProjectBuilds( MavenSession session, List<TaskS
             }
             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 ) );
+                ClassLoader tccl = 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 ) );
+                }
+                finally
+                {
+                    Thread.currentThread().setContextClassLoader( tccl );
+                }
             }
         }
         return new ProjectBuildList( projectBuilds );