This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to annotated tag OpenBSD in repository testng.
commit 859c7830ef39c81ce2a03b7948bab20a8e7139da Author: Andrew Gaul <[email protected]> Date: Mon Jun 30 17:49:47 2014 -0700 Close InputStream and OuputStream after use Found with Kohsuke's file-leak-detector. --- src/main/java/org/testng/reporters/Files.java | 18 +++++++++++------- src/main/java/org/testng/reporters/jq/Main.java | 17 +++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/testng/reporters/Files.java b/src/main/java/org/testng/reporters/Files.java index 1df694a..dc66104 100644 --- a/src/main/java/org/testng/reporters/Files.java +++ b/src/main/java/org/testng/reporters/Files.java @@ -2,6 +2,7 @@ package org.testng.reporters; import java.io.BufferedReader; import java.io.BufferedWriter; +import java.io.Closeable; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -17,7 +18,9 @@ import java.io.Writer; public class Files { public static String readFile(File f) throws IOException { - return readFile(new FileInputStream(f)); + try (InputStream is = new FileInputStream(f)) { + return readFile(is); + } } public static String readFile(InputStream is) throws IOException { @@ -45,12 +48,13 @@ public class Files { to.getParentFile().mkdirs(); } - OutputStream os = new FileOutputStream(to); - byte[] buffer = new byte[65536]; - int count = from.read(buffer); - while (count > 0) { - os.write(buffer, 0, count); - count = from.read(buffer); + try (OutputStream os = new FileOutputStream(to)) { + byte[] buffer = new byte[65536]; + int count = from.read(buffer); + while (count > 0) { + os.write(buffer, 0, count); + count = from.read(buffer); + } } } diff --git a/src/main/java/org/testng/reporters/jq/Main.java b/src/main/java/org/testng/reporters/jq/Main.java index fc763ee..ad2c4e0 100644 --- a/src/main/java/org/testng/reporters/jq/Main.java +++ b/src/main/java/org/testng/reporters/jq/Main.java @@ -71,16 +71,17 @@ public class Main implements IReporter { String all; try { - InputStream header = getClass().getResourceAsStream("/header"); - if (header == null) { - throw new RuntimeException("Couldn't find resource header"); - } else { + try (InputStream header = getClass().getResourceAsStream("/header")) { + if (header == null) { + throw new RuntimeException("Couldn't find resource header"); + } for (String fileName : RESOURCES) { - InputStream is = getClass().getResourceAsStream("/" + fileName); - if (is == null) { - throw new AssertionError("Couldn't find resource: " + fileName); + try (InputStream is = getClass().getResourceAsStream("/" + fileName)) { + if (is == null) { + throw new AssertionError("Couldn't find resource: " + fileName); + } + Files.copyFile(is, new File(m_outputDirectory, fileName)); } - Files.copyFile(is, new File(m_outputDirectory, fileName)); } all = Files.readFile(header); Utils.writeUtf8File(m_outputDirectory, "index.html", xsb, all); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
