From 656c4b15dca26d52034f075bf077fd8c72896a1f Mon Sep 17 00:00:00 2001
From: Jan Materne <jhm@apache.org>
Date: Mon, 21 May 2007 07:11:59 +0000
Subject: [PATCH] <retry>: Collect former error messages and re-throw them.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@540044 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/Retry.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Retry.java b/src/main/org/apache/tools/ant/taskdefs/Retry.java
index 9d783460a..bf297a42b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Retry.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Retry.java
@@ -56,6 +56,7 @@ public class Retry extends Task implements TaskContainer {
      * perform the work
      */
     public void execute() throws BuildException {
+        StringBuffer errorMessages = new StringBuffer();
         for(int i=0; i<=retryCount; i++) {
             try {
                 nestedTask.perform();
@@ -63,8 +64,18 @@ public class Retry extends Task implements TaskContainer {
             } catch (Exception e) {
                 if (i<retryCount) {
                     log("Attempt ["+i+"] error occured, retrying...", e, Project.MSG_INFO);
+                    errorMessages.append(e.getMessage());
+                    errorMessages.append(getProject().getProperty("line.separator"));
                 } else {
-                    throw new BuildException("Task ["+nestedTask.getTaskName()+"] failed after ["+retryCount+"] attempts, giving up");
+                    errorMessages.append(e.getMessage());
+                    StringBuffer exceptionMessage = new StringBuffer();
+                    exceptionMessage.append("Task [").append(nestedTask.getTaskName());
+                    exceptionMessage.append("] failed after [").append(retryCount);
+                    exceptionMessage.append("] attempts, giving up.");
+                    exceptionMessage.append(getProject().getProperty("line.separator"));
+                    exceptionMessage.append("Error messages:").append(getProject().getProperty("line.separator"));
+                    exceptionMessage.append(errorMessages);
+                    throw new BuildException(exceptionMessage.toString(), getLocation());
                 }
             }
         }