bodewig 2005/03/15 07:24:44
Modified: src/main/org/apache/tools/ant/taskdefs/cvslib Tag:
ANT_16_BRANCH ChangeLogTask.java
Log:
merge
Revision Changes Path
No revision
No revision
1.25.2.7 +8 -6
ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
Index: ChangeLogTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
retrieving revision 1.25.2.6
retrieving revision 1.25.2.7
diff -u -r1.25.2.6 -r1.25.2.7
--- ChangeLogTask.java 9 Mar 2005 18:56:24 -0000 1.25.2.6
+++ ChangeLogTask.java 15 Mar 2005 15:24:44 -0000 1.25.2.7
@@ -221,7 +221,7 @@
// We want something of the form: -d ">=YYYY-MM-dd"
final String dateRange = ">=" + outputDate.format(m_start);
- // Supply '-d' as a separate argument - Bug# 14397
+ // Supply '-d' as a separate argument - Bug# 14397
addCommandArgument("-d");
addCommandArgument(dateRange);
}
@@ -250,13 +250,15 @@
setDest(m_dir);
setExecuteStreamHandler(handler);
- super.execute();
- final String errors = handler.getErrors();
+ try {
+ super.execute();
+ } finally {
+ final String errors = handler.getErrors();
- if (null != errors) {
- log(errors, Project.MSG_ERR);
+ if (null != errors) {
+ log(errors, Project.MSG_ERR);
+ }
}
-
final CVSEntry[] entrySet = parser.getEntrySetAsArray();
final CVSEntry[] filteredEntrySet = filterEntrySet(entrySet);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
