Merge branch 'use_try_with_resource' into master

refs #2734
2020-08-24 20:33:00 +02:00
parent b6531787d3 c5e2234763
commit 699ee7e2bf
2 changed files with 3 additions and 15 deletions
--- a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/FileReporterTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/FileReporterTest.java
@@ -54,9 +54,7 @@ public class FileReporterTest {
    }

    private String readFile(File file) throws IOException {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new FileReader(file));
+        try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
            StringBuilder buffer = new StringBuilder();
            String line = reader.readLine();
            while (line != null) {
@@ -67,10 +65,6 @@ public class FileReporterTest {
                }
            }
            return buffer.toString();
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
        }
    }