Skip to content

[MNG-12594] Fix LegacySupport.setSession() thread safety in DefaultMaven #12634

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

Draft
elharo wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Draft

[MNG-12594] Fix LegacySupport.setSession() thread safety in DefaultMaven #12634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions impl/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,6 @@ public MavenExecutionResult execute(MavenExecutionRequest request) {
result = addExceptionToResult(
new DefaultMavenExecutionResult(), new InternalErrorException("Internal error: " + e, e));
}
} finally {
legacySupport.setSession(null);
}

return result;
Expand Down Expand Up @@ -221,9 +219,13 @@ private MavenExecutionResult doExecute(MavenExecutionRequest request) {
sessionScope.seed(Session.class, session.getSession());
sessionScope.seed(InternalMavenSession.class, InternalMavenSession.from(session.getSession()));

MavenSession previousSession = legacySupport.getSession();
legacySupport.setSession(session);

return doExecute(request, session, result, chainedWorkspaceReader);
try {
return doExecute(request, session, result, chainedWorkspaceReader);
Comment on lines +222 to +225
} finally {
legacySupport.setSession(previousSession);
Comment on lines 223 to +227
}
} finally {
sessionScope.exit();
}
Expand Down
Loading