From 50cebd85a832d82349ce4850735b5ba0aee3e98d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 5 Mar 2018 16:23:08 +0900 Subject: [PATCH] DirCacheCGitCompatabilityTest: Open BufferedReader in try-with-resource Change-Id: I0494eb475954927743174941a7d6c06d8431f57f Signed-off-by: David Pursehouse --- .../dircache/DirCacheCGitCompatabilityTest.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheCGitCompatabilityTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheCGitCompatabilityTest.java index 92ce4e178..96538da6d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheCGitCompatabilityTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheCGitCompatabilityTest.java @@ -234,32 +234,26 @@ public class DirCacheCGitCompatabilityTest extends LocalDiskRepositoryTestCase { private static Map readLsFiles() throws Exception { final LinkedHashMap r = new LinkedHashMap<>(); - final BufferedReader br = new BufferedReader(new InputStreamReader( - new FileInputStream(pathOf("gitgit.lsfiles")), "UTF-8")); - try { + try (BufferedReader br = new BufferedReader(new InputStreamReader( + new FileInputStream(pathOf("gitgit.lsfiles")), "UTF-8"))) { String line; while ((line = br.readLine()) != null) { final CGitIndexRecord cr = new CGitIndexRecord(line); r.put(cr.path, cr); } - } finally { - br.close(); } return r; } private static Map readLsTree() throws Exception { final LinkedHashMap r = new LinkedHashMap<>(); - final BufferedReader br = new BufferedReader(new InputStreamReader( - new FileInputStream(pathOf("gitgit.lstree")), "UTF-8")); - try { + try (BufferedReader br = new BufferedReader(new InputStreamReader( + new FileInputStream(pathOf("gitgit.lstree")), "UTF-8"))) { String line; while ((line = br.readLine()) != null) { final CGitLsTreeRecord cr = new CGitLsTreeRecord(line); r.put(cr.path, cr); } - } finally { - br.close(); } return r; }