Repository: maven Updated Branches: refs/heads/master 73d35ba95 -> 18964baa2
Make sure participants and session scope exit are called Even in case of failing build. Signed-off-by: Jason van Zyl <ja...@tesla.io> Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/18964baa Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/18964baa Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/18964baa Branch: refs/heads/master Commit: 18964baa25e9c071d13186e4c03e3957b9381961 Parents: 73d35ba Author: Tamas Cservenak <ta...@cservenak.net> Authored: Fri May 30 15:26:54 2014 +0200 Committer: Jason van Zyl <ja...@tesla.io> Committed: Tue Jun 10 07:27:03 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/maven/DefaultMaven.java | 54 ++++++++++---------- 1 file changed, 26 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/18964baa/maven-core/src/main/java/org/apache/maven/DefaultMaven.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index ab47efd..d8425b5 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -336,48 +336,46 @@ public class DefaultMaven // projectDependencyGraph = createProjectDependencyGraph( session.getProjects(), request, result, false ); - if ( result.hasExceptions() ) + try { - try - { - afterSessionEnd( projects, session ); - } - catch ( MavenExecutionException e ) + if ( result.hasExceptions() ) { - return addExceptionToResult( result, e ); + return result; } - return result; - } - - session.setProjects( projectDependencyGraph.getSortedProjects() ); + session.setProjects( projectDependencyGraph.getSortedProjects() ); - session.setProjectDependencyGraph( projectDependencyGraph ); + session.setProjectDependencyGraph( projectDependencyGraph ); - result.setTopologicallySortedProjects( session.getProjects() ); + result.setTopologicallySortedProjects( session.getProjects() ); - result.setProject( session.getTopLevelProject() ); + result.setProject( session.getTopLevelProject() ); - lifecycleStarter.execute( session ); + lifecycleStarter.execute( session ); - validateActivatedProfiles( session.getProjects(), request.getActiveProfiles() ); + validateActivatedProfiles( session.getProjects(), request.getActiveProfiles() ); - if ( session.getResult().hasExceptions() ) - { - return addExceptionToResult( result, session.getResult().getExceptions().get( 0 ) ); + if ( session.getResult().hasExceptions() ) + { + return addExceptionToResult( result, session.getResult().getExceptions().get( 0 ) ); + } } - - try - { - afterSessionEnd( projects, session ); - } - catch ( MavenExecutionException e ) + finally { - return addExceptionToResult( result, e ); + try + { + afterSessionEnd( projects, session ); + } + catch ( MavenExecutionException e ) + { + return addExceptionToResult( result, e ); + } + finally + { + sessionScope.exit(); + } } - sessionScope.exit(); - return result; }
