You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/09/14 22:51:46 UTC
svn commit: r443466 -
/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Author: evenisse
Date: Thu Sep 14 13:51:46 2006
New Revision: 443466
URL: http://svn.apache.org/viewvc?view=rev&rev=443466
Log:
[CONTINUUM-874] Fix notification dispatching (merge from rev.443463)
Modified:
maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?view=diff&rev=443466&r1=443465&r2=443466
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Thu Sep 14 13:51:46 2006
@@ -162,24 +162,27 @@
{
Project project = context.getProject();
- if ( project.getState() != ContinuumProjectState.NEW && project.getState() != ContinuumProjectState.CHECKEDOUT
- && project.getState() != ContinuumProjectState.OK && project.getState() != ContinuumProjectState.FAILED
- && project.getState() != ContinuumProjectState.ERROR )
+ try
{
- try
+ if ( project.getState() != ContinuumProjectState.NEW && project.getState() != ContinuumProjectState.CHECKEDOUT
+ && project.getState() != ContinuumProjectState.OK && project.getState() != ContinuumProjectState.FAILED
+ && project.getState() != ContinuumProjectState.ERROR )
{
- project.setState( ContinuumProjectState.ERROR );
+ try
+ {
+ project.setState( ContinuumProjectState.ERROR );
- store.updateProject( project );
- }
- catch ( ContinuumStoreException e )
- {
- throw new TaskExecutionException( "Error storing the project", e );
- }
- finally
- {
- notifierDispatcher.buildComplete( project, context.getBuildResult() );
+ store.updateProject( project );
+ }
+ catch ( ContinuumStoreException e )
+ {
+ throw new TaskExecutionException( "Error storing the project", e );
+ }
}
+ }
+ finally
+ {
+ notifierDispatcher.buildComplete( project, context.getBuildResult() );
}
}