From b452414614852cf75972b49ee196771391cbc7cb Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sat, 5 Mar 2016 21:06:20 +0000 Subject: [PATCH] Close stream --- source/net/filebot/util/FileUtilities.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/source/net/filebot/util/FileUtilities.java b/source/net/filebot/util/FileUtilities.java index 8e81442d..a7b1c900 100644 --- a/source/net/filebot/util/FileUtilities.java +++ b/source/net/filebot/util/FileUtilities.java @@ -214,16 +214,17 @@ public final class FileUtilities { return destination; } - public static List readCSV(InputStream source, String charsetName, String separatorPattern) { - Scanner scanner = new Scanner(source, charsetName); - Pattern separator = Pattern.compile(separatorPattern); - List rows = new ArrayList(65536); + public static List readCSV(InputStream source, String charsetName, String pattern) { + try (Scanner scanner = new Scanner(source, charsetName)) { + Pattern separator = Pattern.compile(pattern); + List rows = new ArrayList(65536); - while (scanner.hasNextLine()) { - rows.add(separator.split(scanner.nextLine())); + while (scanner.hasNextLine()) { + rows.add(separator.split(scanner.nextLine())); + } + + return rows; } - - return rows; } public static Reader createTextReader(File file) throws IOException {