continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1594454 - in /continuum/trunk: continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/ continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/
Date Wed, 14 May 2014 05:12:47 GMT
Author: brett
Date: Wed May 14 05:12:47 2014
New Revision: 1594454

URL: http://svn.apache.org/r1594454
Log:
[CONTINUUM-2222] do not remove POM on error

This was probably in place due to reading temporary files, but all callers into this method
are
providing POMs from the working copy. Let the caller delete it if it notices an error and
it
passed a temporary file instead

Modified:
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java

Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java?rev=1594454&r1=1594453&r2=1594454&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java
(original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java
Wed May 14 05:12:47 2014
@@ -172,8 +172,6 @@ public class DefaultBuildAgentMavenBuild
 
             String msg = "Cannot build maven project from " + file + " (" + e.getMessage()
+ ").\n" + messages;
 
-            file.delete();
-
             log.error( msg );
 
             return null;
@@ -185,8 +183,6 @@ public class DefaultBuildAgentMavenBuild
 
             String msg = "Cannot build maven project from " + file + " (" + e.getMessage()
+ ").";
 
-            file.delete();
-
             log.error( msg );
 
             return null;

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=1594454&r1=1594453&r2=1594454&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
Wed May 14 05:12:47 2014
@@ -441,8 +441,6 @@ public class DefaultMavenBuilderHelper
 
             String msg = "Cannot build maven project from " + file + " (" + e.getMessage()
+ ").\n" + messages;
 
-            file.delete();
-
             log.error( msg );
 
             return null;
@@ -454,8 +452,6 @@ public class DefaultMavenBuilderHelper
 
             String msg = "Cannot build maven project from " + file + " (" + e.getMessage()
+ ").";
 
-            file.delete();
-
             log.error( msg );
 
             return null;



Mime
View raw message