From 5f0f83111959eb89b47e4378393d6e0b072dc778 Mon Sep 17 00:00:00 2001 From: "Jesse N. Glick" Date: Mon, 27 Feb 2012 21:35:24 +0000 Subject: [PATCH] #52738: safer stream closing. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1294340 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/optional/junit/XMLResultAggregator.java | 9 +++------ 1 file changed, 3 insertions(+), 6 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 a8edf1912..fd41e08c3 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 @@ -211,11 +211,9 @@ public class XMLResultAggregator extends Task implements XMLConstants { * @throws IOException thrown if there is an error while writing the content. */ protected void writeDOMTree(Document doc, File file) throws IOException { - OutputStream out = null; - PrintWriter wri = null; + OutputStream os = new FileOutputStream(file); try { - out = new BufferedOutputStream(new FileOutputStream(file)); - wri = new PrintWriter(new OutputStreamWriter(out, "UTF8")); + PrintWriter wri = new PrintWriter(new OutputStreamWriter(new BufferedOutputStream(os), "UTF8")); wri.write("\n"); (new DOMElementWriter()).write(doc.getDocumentElement(), wri, 0, " "); wri.flush(); @@ -224,8 +222,7 @@ public class XMLResultAggregator extends Task implements XMLConstants { throw new IOException("Error while writing DOM content"); } } finally { - FileUtils.close(wri); - FileUtils.close(out); + os.close(); } }