continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r702341 - /continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Date Tue, 07 Oct 2008 04:31:09 GMT
Author: evenisse
Date: Mon Oct  6 21:31:09 2008
New Revision: 702341

URL: http://svn.apache.org/viewvc?rev=702341&view=rev
Log:
merge -r 702339:702340 from continuum-1.2.x branch. [CONTINUUM-1808] Add maven2 validation
errors inthe output text field of the build result page

Modified:
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=702341&r1=702340&r2=702341&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Mon Oct  6 21:31:09 2008
@@ -161,7 +161,9 @@
             }
             catch ( TaskExecutionException e )
             {
-                //just log the error but don't stop the build from progressing in order not
to suppress any build result messages there 
+                updateBuildResult( context, ContinuumUtils.throwableToString( e ) );
+
+                //just log the error but don't stop the build from progressing in order not
to suppress any build result messages there
                 getLogger().error( "Error executing action update-project-from-working-directory
'", e );
             }
 
@@ -546,8 +548,8 @@
         }
 
         // Check changes
-        if ( !shouldBuild && ( ( !allChangesUnknown && !context.getScmResult().getChanges().isEmpty()
)
-             || project.getExecutorId().equals( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR
) ) )
+        if ( !shouldBuild && ( ( !allChangesUnknown && !context.getScmResult().getChanges().isEmpty()
) ||
+            project.getExecutorId().equals( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR
) ) )
         {
             try
             {
@@ -558,6 +560,7 @@
             }
             catch ( Exception e )
             {
+                updateBuildResult( context, ContinuumUtils.throwableToString( e ) );
                 throw new TaskExecutionException( "Can't determine if the project should
build or not", e );
             }
         }



Mime
View raw message