continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r264764 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Date Tue, 30 Aug 2005 11:56:50 GMT
Author: evenisse
Date: Tue Aug 30 04:56:46 2005
New Revision: 264764

URL: http://svn.apache.org/viewcvs?rev=264764&view=rev
Log:
Check ScmResult for update

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

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=264764&r1=264763&r2=264764&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Tue Aug 30 04:56:46 2005
@@ -130,32 +130,32 @@
                                        workingDirectoryService.getWorkingDirectory( project
).getAbsolutePath() );
 
                     actionManager.lookup( "checkout-project" ).execute( actionContext );
+                }
 
-                    scmResult = AbstractContinuumAction.getCheckoutResult( actionContext,
null );
-
-                    // ----------------------------------------------------------------------
-                    // Check to see if there was a error while checking out the project
-                    // ----------------------------------------------------------------------
+                scmResult = AbstractContinuumAction.getCheckoutResult( actionContext, null
);
 
-                    if ( scmResult == null || !scmResult.isSuccess() )
-                    {
-                        build = makeBuildResult( scmResult, startTime, trigger );
+                // ----------------------------------------------------------------------
+                // Check to see if there was a error while checking out/updating the project
+                // ----------------------------------------------------------------------
 
-                        String error = convertScmResultToError( scmResult );
+                if ( scmResult == null || !scmResult.isSuccess() )
+                {
+                    build = makeBuildResult( scmResult, startTime, trigger );
 
-                        build.setError( error );
+                    String error = convertScmResultToError( scmResult );
 
-                        store.addBuildResult( project, build );
+                    build.setError( error );
 
-                        project.setState( ContinuumProjectState.ERROR );
+                    store.addBuildResult( project, build );
 
-                        store.updateProject( project );
+                    project.setState( ContinuumProjectState.ERROR );
 
-                        return;
-                    }
+                    store.updateProject( project );
 
-                    actionContext.put( AbstractContinuumAction.KEY_UPDATE_SCM_RESULT, scmResult
);
+                    return;
                 }
+
+                actionContext.put( AbstractContinuumAction.KEY_UPDATE_SCM_RESULT, scmResult
);
 
                 scmResult = (ScmResult) actionContext.get( AbstractContinuumAction.KEY_UPDATE_SCM_RESULT
);
 



Mime
View raw message