Skip to content

[MNG-7455] Another attempt to fix the concurrency issue #716

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
gnodet wants to merge 2 commits into from
Closed

[MNG-7455] Another attempt to fix the concurrency issue #716

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
906468b
[MNG-7455] Minimal fix for the concurrency issue
gnodet Apr 12, 2022
d24adb7
Add some javadoc
gnodet Apr 12, 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
5 changes: 5 additions & 0 deletions maven-core/src/main/java/org/apache/maven/SessionScoped.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
* Indicates that annotated component should be instantiated before session execution starts
* and discarded after session execution completes.
*
* Note that components will be cached in the session scope and be injected with the root session.
* Derived sessions will reuse the same components than their root sessions, thus components
* should not rely on {@link org.apache.maven.execution.MavenSession#getCurrentProject()} which
* will always return the root project.
*
* @author Jason van Zyl
* @since 3.2.0
*/
Expand Down
13 changes: 0 additions & 13 deletions maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,6 @@ public void buildProject( MavenSession session, MavenSession rootSession, Reacto

long buildStartTime = System.currentTimeMillis();

// session may be different from rootSession seeded in DefaultMaven
// explicitly seed the right session here to make sure it is used by Guice
final boolean scoped = session != rootSession;
if ( scoped )
{
sessionScope.enter();
sessionScope.seed( MavenSession.class, session );
}
try
{

Expand Down Expand Up @@ -149,11 +141,6 @@ public void buildProject( MavenSession session, MavenSession rootSession, Reacto
}
finally
{
if ( scoped )
{
sessionScope.exit();
}

session.setCurrentProject( null );

Thread.currentThread().setContextClassLoader( reactorContext.getOriginalContextClassLoader() );
Expand Down