From a1ead428480fc5eadb4642a59929d716c5a863f4 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Thu, 11 Nov 2004 12:14:48 +0000 Subject: [PATCH] factor out close logic. This changes semantics slightly was we no longer raise an IOE if file closure fails. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277011 13f79535-47bb-0310-9956-ffa450edef68 --- .../taskdefs/optional/junit/XMLResultAggregator.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index bca386a3c..a6d391446 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -34,6 +34,7 @@ import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.util.DOMElementWriter; import org.apache.tools.ant.util.StringUtils; +import org.apache.tools.ant.util.FileUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; @@ -200,13 +201,8 @@ public class XMLResultAggregator extends Task implements XMLConstants { throw new IOException("Error while writing DOM content"); } } finally { - if (wri != null) { - wri.close(); - out = null; - } - if (out != null) { - out.close(); - } + FileUtils.close(wri); + FileUtils.close(out); } }