Skip to content

MNG-7401 - Make MavenSession#getCurrentProject() using a thread local #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
laeubi wants to merge 2 commits into from
Closed

MNG-7401 - Make MavenSession#getCurrentProject() using a thread local #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e65a7a
MNG-7401 - Make MavenSession#getCurrentProject() using a thread local
Jan 29, 2022
49365a6
No more need to clone the session
Jan 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class MavenSession

private Properties executionProperties;

private MavenProject currentProject;
private ThreadLocal<MavenProject> currentProject = new ThreadLocal<>();

/**
* These projects have already been topologically sorted in the {@link org.apache.maven.Maven} component before
Expand Down Expand Up @@ -90,20 +90,21 @@ public void setProjects( List<MavenProject> projects )
{
if ( !projects.isEmpty() )
{
this.currentProject = projects.get( 0 );
this.topLevelProject = currentProject;
MavenProject first = projects.get( 0 );
this.topLevelProject = first;
this.currentProject = ThreadLocal.withInitial( () -> first );
for ( MavenProject project : projects )
{
if ( project.isExecutionRoot() )
{
topLevelProject = project;
this.topLevelProject = project;
break;
}
}
}
else
{
this.currentProject = null;
this.currentProject = new ThreadLocal<>();
this.topLevelProject = null;
}
this.projects = projects;
Expand Down Expand Up @@ -164,12 +165,12 @@ public MavenExecutionRequest getRequest()

public void setCurrentProject( MavenProject currentProject )
{
this.currentProject = currentProject;
this.currentProject.set( currentProject );
}

public MavenProject getCurrentProject()
{
return currentProject;
return currentProject.get();
}

public ProjectBuildingRequest getProjectBuildingRequest()
Expand Down Expand Up @@ -240,7 +241,12 @@ public MavenSession clone()
{
try
{
return (MavenSession) super.clone();
MavenSession clone = (MavenSession) super.clone();
// the default must become the current project of the thread that clones this
MavenProject current = getCurrentProject();
// we replace the thread local of the clone to prevent write through and enforce the new default value
clone.currentProject = ThreadLocal.withInitial( () -> current );
return clone;
}
catch ( CloneNotSupportedException e )
{
Expand Down
13 changes: 10 additions & 3 deletions maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,16 @@ 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 ) );
MavenProject currentProject = session.getCurrentProject();
try
{
session.setCurrentProject( project );
projectBuilds.add( new ProjectSegment( project, taskSegment, session ) );
}
finally
{
session.setCurrentProject( currentProject );
}
}
}
return new ProjectBuildList( projectBuilds );
Expand Down