Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MNG-5578 fixed guice OutOfScopeException during multithreaded build 

This was a regression since 3.2.1 introduced by my commit 48fec944

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
This commit is contained in:
Igor Fedorenko 2014-05-22 14:55:28 -04:00
parent 65863e0a28
commit 702acd2e8b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
View File

@ -22,6 +22,7 @@ package org.apache.maven.lifecycle.internal;
import java.util.HashSet;
import java.util.List;
import org.apache.maven.SessionScope;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.BuildSuccess;
import org.apache.maven.execution.ExecutionEvent;
@ -64,6 +65,9 @@ public class LifecycleModuleBuilder
@Requirement
private List<ProjectExecutionListener> projectExecutionListeners;
@Requirement
private SessionScope sessionScope;
public void setProjectExecutionListeners( final List<ProjectExecutionListener> listeners )
{
this.projectExecutionListeners = listeners;
@ -83,6 +87,10 @@ public class LifecycleModuleBuilder
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
sessionScope.enter();
sessionScope.seed( MavenSession.class, session );
try
{
@ -125,6 +133,8 @@ public class LifecycleModuleBuilder
}
finally
{
sessionScope.exit();
session.setCurrentProject( null );
Thread.currentThread().setContextClassLoader( reactorContext.getOriginalContextClassLoader() );