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 2009/04/30 07:05:46 UTC
svn commit: r770067 - in
/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum:
buildcontroller/DefaultBuildController.java
core/action/AbstractContinuumAction.java
Author: evenisse
Date: Thu Apr 30 05:05:45 2009
New Revision: 770067
URL: http://svn.apache.org/viewvc?rev=770067&view=rev
Log:
[CONTINUUM-2212] Fix RuntimeException when the project doesn't need to be built.
Submitted by Chritian Schulte
merge -r 770063:770064 from continuum-1.3.x branch
Modified:
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.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=770067&r1=770066&r2=770067&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 Thu Apr 30 05:05:45 2009
@@ -165,7 +165,7 @@
context.setCancelled( (Boolean) actionContext.get( AbstractContinuumAction.KEY_CANCELLED ) );
- String s = AbstractContinuumAction.getBuildId( actionContext );
+ String s = AbstractContinuumAction.getBuildId( actionContext, null );
if ( s != null && !context.isCancelled() )
{
@@ -213,19 +213,14 @@
{
try
{
- String s = AbstractContinuumAction.getBuildId( context.getActionContext() );
+ String s = AbstractContinuumAction.getBuildId( context.getActionContext(), null );
if ( s != null )
{
BuildResult buildResult = buildResultDao.getBuildResult( Integer.valueOf( s ) );
project.setState( buildResult.getState() );
+ projectDao.updateProject( project );
}
- else
- {
- project.setState( ContinuumProjectState.ERROR );
- }
-
- projectDao.updateProject( project );
}
catch ( ContinuumStoreException e )
{
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=770067&r1=770066&r2=770067&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java Thu Apr 30 05:05:45 2009
@@ -138,6 +138,11 @@
return getString( context, KEY_BUILD_ID );
}
+ public static String getBuildId( Map<String, Object> context, String defaultValue )
+ {
+ return getString( context, KEY_BUILD_ID, defaultValue );
+ }
+
public static int getTrigger( Map<String, Object> context )
{
return getInteger( context, KEY_TRIGGER );