diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d6fbc9158..982a7e488 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -21,6 +21,7 @@ Anil K. Vijendran Anli Shundi Anthony Goubard Anthony Green +Anthony Wat Antoine Baudoux Antoine Levy-Lambert Anton Mazkovoi diff --git a/WHATSNEW b/WHATSNEW index 08823b846..bfe25fc45 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -45,7 +45,11 @@ Fixed bugs: Bugzilla Report 51035. * Exec task may mix the stderr and stdout output while logging it - Bugzilla Report 50507. + Bugzilla Report 50507. + + * Missing space between "finished" and timestamp in task/target + finish message from ProfileLogger. + Bugzilla Report 51109. Other changes: -------------- diff --git a/contributors.xml b/contributors.xml index b0d02c8a2..f0bf380dc 100644 --- a/contributors.xml +++ b/contributors.xml @@ -107,6 +107,10 @@ Anthony Green + + Anthony + Wat + Antoine Baudoux diff --git a/manual/listeners.html b/manual/listeners.html index 7904ca240..2f5e5750b 100644 --- a/manual/listeners.html +++ b/manual/listeners.html @@ -514,23 +514,23 @@ Target aTarget: started Thu Jan 22 09:01:00 CET 2009 echo: started Thu Jan 22 09:01:00 CET 2009 [echo] echo-task -echo: finishedThu Jan 22 09:01:00 CET 2009 (250ms) +echo: finished Thu Jan 22 09:01:00 CET 2009 (250ms) zip: started Thu Jan 22 09:01:00 CET 2009 [zip] Building zip: ...\my.zip -zip: finishedThu Jan 22 09:01:01 CET 2009 (1313ms) +zip: finished Thu Jan 22 09:01:01 CET 2009 (1313ms) -Target aTarget: finishedThu Jan 22 09:01:01 CET 2009 (1719ms) +Target aTarget: finished Thu Jan 22 09:01:01 CET 2009 (1719ms) Target anotherTarget: started Thu Jan 22 09:01:01 CET 2009 echo: started Thu Jan 22 09:01:01 CET 2009 [echo] another-echo-task -echo: finishedThu Jan 22 09:01:01 CET 2009 (0ms) +echo: finished Thu Jan 22 09:01:01 CET 2009 (0ms) -Target anotherTarget: finishedThu Jan 22 09:01:01 CET 2009 (0ms) +Target anotherTarget: finished Thu Jan 22 09:01:01 CET 2009 (0ms) BUILD SUCCESSFUL Total time: 2 seconds diff --git a/src/main/org/apache/tools/ant/listener/ProfileLogger.java b/src/main/org/apache/tools/ant/listener/ProfileLogger.java index 5c7cfb1fb..43a3db914 100644 --- a/src/main/org/apache/tools/ant/listener/ProfileLogger.java +++ b/src/main/org/apache/tools/ant/listener/ProfileLogger.java @@ -93,10 +93,10 @@ public class ProfileLogger extends DefaultLogger { String msg = null; if (start != null) { long diff = now.getTime() - start.getTime(); - msg = StringUtils.LINE_SEP + name + ": finished" + now + " (" + msg = StringUtils.LINE_SEP + name + ": finished " + now + " (" + diff + "ms)"; } else { - msg = StringUtils.LINE_SEP + name + ": finished" + now + msg = StringUtils.LINE_SEP + name + ": finished " + now + " (unknown duration, start not detected)"; } printMessage(msg, out, event.getPriority());