You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/02/19 01:05:25 UTC

svn commit: r1660770 - /continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java

Author: batkinson
Date: Thu Feb 19 00:05:25 2015
New Revision: 1660770

URL: http://svn.apache.org/r1660770
Log:
[CONTINUUM-2734] Build results are being deleted for canceled builds

Modified:
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=1660770&r1=1660769&r2=1660770&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Thu Feb 19 00:05:25 2015
@@ -150,50 +150,35 @@ public class ExecuteBuilderContinuumActi
         {
             project = projectDao.getProject( project.getId() );
 
-            if ( buildResult.getState() == ContinuumProjectState.CANCELLED )
-            {
-                project.setState( project.getOldState() );
-
-                project.setOldState( 0 );
-
-                int buildResultId = getOldBuildId( context );
+            buildResult.setEndTime( new Date().getTime() );
 
-                project.setLatestBuildId( buildResultId );
-
-                buildResultDao.removeBuildResult( buildResult );
-            }
-            else
+            if ( buildResult.getState() == ContinuumProjectState.OK )
             {
-                buildResult.setEndTime( new Date().getTime() );
-
-                if ( buildResult.getState() == ContinuumProjectState.OK )
-                {
-                    project.setBuildNumber( project.getBuildNumber() + 1 );
-                }
+                project.setBuildNumber( project.getBuildNumber() + 1 );
+            }
 
-                project.setLatestBuildId( buildResult.getId() );
+            project.setLatestBuildId( buildResult.getId() );
 
-                buildResult.setBuildNumber( project.getBuildNumber() );
+            buildResult.setBuildNumber( project.getBuildNumber() );
 
-                if ( buildResult.getState() != ContinuumProjectState.OK &&
-                    buildResult.getState() != ContinuumProjectState.FAILED &&
-                    buildResult.getState() != ContinuumProjectState.ERROR )
-                {
-                    buildResult.setState( ContinuumProjectState.ERROR );
-                }
+            if ( buildResult.getState() != ContinuumProjectState.OK &&
+                buildResult.getState() != ContinuumProjectState.FAILED &&
+                buildResult.getState() != ContinuumProjectState.ERROR )
+            {
+                buildResult.setState( ContinuumProjectState.ERROR );
+            }
 
-                project.setState( buildResult.getState() );
+            project.setState( buildResult.getState() );
 
-                // ----------------------------------------------------------------------
-                // Copy over the buildResult result
-                // ----------------------------------------------------------------------
+            // ----------------------------------------------------------------------
+            // Copy over the buildResult result
+            // ----------------------------------------------------------------------
 
-                buildResultDao.updateBuildResult( buildResult );
+            buildResultDao.updateBuildResult( buildResult );
 
-                buildResult = buildResultDao.getBuildResult( buildResult.getId() );
+            buildResult = buildResultDao.getBuildResult( buildResult.getId() );
 
-                notifier.goalsCompleted( project, buildDefinition, buildResult );
-            }
+            notifier.goalsCompleted( project, buildDefinition, buildResult );
 
             AbstractContinuumAction.setProject( context, project );