Author: ctan
Date: Tue Jul 28 03:18:58 2009
New Revision: 798381
URL: http://svn.apache.org/viewvc?rev=798381&view=rev
Log:
[CONTINUUM-2303] do not add project to build queue if it is not selected
merge -r 798379:798380 from 1.3.x branch
Modified:
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java?rev=798381&r1=798380&r2=798381&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
Tue Jul 28 03:18:58 2009
@@ -534,27 +534,6 @@
throw new TaskExecutionException( "Error while creating build object",
e );
}
}
- else if ( project.getState() == ContinuumProjectState.CHECKEDOUT ||
- project.getState() == ContinuumProjectState.NEW ) //check if no build result
yet for project
- {
- try
- {
- //get default build definition for project
- BuildDefinition buildDefinition = buildDefinitionDao.getDefaultBuildDefinition(
project.getId() );
- projectsBuildDefinitionsMap.put( project.getId(), buildDefinition );
- projectsToBeBuilt.add( project );
- }
- catch ( ContinuumStoreException e )
- {
- log.error( "Error while creating build object", e );
- throw new TaskExecutionException( "Error while creating build object",
e );
- }
- catch ( Exception e )
- {
- log.error( e.getMessage(), e );
- throw new TaskExecutionException( "Error executing action 'build-project'",
e );
- }
- }
}
try
|