You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2009/09/28 07:59:34 UTC
svn commit: r819457 -
/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
Author: ctan
Date: Mon Sep 28 05:59:33 2009
New Revision: 819457
URL: http://svn.apache.org/viewvc?rev=819457&view=rev
Log:
[CONTINUUM-2207] prevent setting a null scmResult to avoid getting a missing value for 'scmResult' key error"
merge -r 819455:819456 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=819457&r1=819456&r2=819457&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 Mon Sep 28 05:59:33 2009
@@ -160,7 +160,7 @@
log.info(
"Ending prepare build of project: " + AbstractContinuumAction.getProject( context ).getName() );
scmResultMap.put( AbstractContinuumAction.getProjectId( context ),
- AbstractContinuumAction.getScmResult( context, null ) );
+ AbstractContinuumAction.getScmResult( context, new ScmResult() ) );
endProjectPrepareBuild( context );
}
}
@@ -264,6 +264,13 @@
scmResult = CheckoutProjectContinuumAction.getCheckoutResult( context, null );
}
+ // [CONTINUUM-2207] when returned scmResult is null, this causes a problem when building the project
+ if ( scmResult == null )
+ {
+ log.debug( "Returned ScmResult is null when updating the working directory" );
+ scmResult = new ScmResult();
+ }
+
AbstractContinuumAction.setScmResult( context, scmResult );
}