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

o take the reactor manager out of more signatures, it's contained in the session so we don't need to pass around both 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@759545 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-03-28 18:30:22 +00:00
parent ace08b348d
commit 02265b1ef5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -124,7 +124,7 @@ public class DefaultLifecycleExecutor
for ( String goal : goals )
{
String target = currentProject.getId() + " ( " + goal + " )";
executeGoalAndHandleFailures( goal, session, currentProject, session.getReactorManager(), buildStartTime, target );
executeGoalAndHandleFailures( goal, session, currentProject, buildStartTime, target );
}
}
finally
@ -137,7 +137,7 @@ public class DefaultLifecycleExecutor
}
}
private void executeGoalAndHandleFailures( String task, MavenSession session, MavenProject project, ReactorManager rm, long buildStartTime, String target )
private void executeGoalAndHandleFailures( String task, MavenSession session, MavenProject project, long buildStartTime, String target )
throws BuildFailureException, LifecycleExecutionException
{
try
@ -146,22 +146,25 @@ public class DefaultLifecycleExecutor
}
catch ( LifecycleExecutionException e )
{
if ( handleExecutionFailure( rm, project, e, task, buildStartTime ) )
if ( handleExecutionFailure( session, project, e, task, buildStartTime ) )
{
throw e;
}
}
catch ( BuildFailureException e )
{
if ( handleExecutionFailure( rm, project, e, task, buildStartTime ) )
if ( handleExecutionFailure( session, project, e, task, buildStartTime ) )
{
throw e;
}
}
}
private boolean handleExecutionFailure( ReactorManager rm, MavenProject project, Exception e, String task, long buildStartTime )
private boolean handleExecutionFailure( MavenSession session, MavenProject project, Exception e, String task, long buildStartTime )
{
//TODO: we shouldn't be registering build failures with the reactor manager, it should be in the session.
ReactorManager rm = session.getReactorManager();
rm.registerBuildFailure( project, e, task, System.currentTimeMillis() - buildStartTime );
if ( ReactorManager.FAIL_FAST.equals( rm.getFailureBehavior() ) )