From ca1c33e3112d9217e89eec82bbcd589381d48715 Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Sat, 14 Mar 2015 23:20:42 +0100 Subject: [PATCH] Clean up open streams, issue #778 All violations of Fildbugs rule [OBL: Method may fail to clean up stream or resource](http://findbugs.sourceforge.net/bugDescriptions.html#OBL_UNSATISFIED_OBLIGATION) are fixed. --- .../java/com/puppycrawl/tools/checkstyle/Main.java | 8 ++------ .../tools/checkstyle/checks/UniquePropertiesCheck.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java index ffbb9ead0..4561eb279 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java @@ -273,9 +273,8 @@ public final class Main private static Properties loadProperties(File file) { final Properties properties = new Properties(); - FileInputStream fis = null; - try { - fis = new FileInputStream(file); + + try (final FileInputStream fis = new FileInputStream(file)) { properties.load(fis); } catch (final IOException ex) { @@ -284,9 +283,6 @@ public final class Main ex.printStackTrace(System.out); System.exit(1); } - finally { - Utils.closeQuietly(fis); - } return properties; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java index 96c176888..ce40a1f9f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java @@ -64,8 +64,14 @@ public class UniquePropertiesCheck extends AbstractFileSetCheck final UniqueProperties properties = new UniqueProperties(); try { - // As file is already read, there should not be any exceptions. - properties.load(new FileInputStream(file)); + final FileInputStream fileInputStream = new FileInputStream(file); + try { + // As file is already read, there should not be any exceptions. + properties.load(fileInputStream); + } + finally { + fileInputStream.close(); + } } catch (IOException e) { log(0, IO_EXCEPTION_KEY, file.getPath(),