From a04e11dde312e5b8e45e9a768ae0deb5e3be2454 Mon Sep 17 00:00:00 2001 From: Nico Seessle Date: Tue, 1 May 2001 11:37:56 +0000 Subject: [PATCH] The file was not correctly closed after validating it's contents, so the tests failed on Windows. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268992 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/CVSPassTest.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java index ee07c8f5b..cea6b7e5a 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java @@ -138,13 +138,21 @@ public class CVSPassTest extends TaskdefsTest { } private String readFile(File f) throws Exception { - BufferedReader reader = new BufferedReader(new FileReader(f)); - - StringBuffer buf = new StringBuffer(); - String line=null; - while((line=reader.readLine())!=null){ - buf.append(line + EOL); + BufferedReader reader = null; + + try { + reader = new BufferedReader(new FileReader(f)); + + StringBuffer buf = new StringBuffer(); + String line=null; + while((line=reader.readLine())!=null){ + buf.append(line + EOL); + } + return buf.toString(); + } finally { + if (reader != null) { + reader.close(); + } } - return buf.toString(); } }