From 209bb6ea94e56f4b56abc67d5a50f1734bfd6773 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 6 Mar 2018 16:49:23 +0900 Subject: [PATCH] EGitPatchHistoryTest: Open BufferedReader in try-with-resource Change-Id: I74aede463c7b0a478a1e0e8b680c206d3964061d Signed-off-by: David Pursehouse --- .../jgit/patch/EGitPatchHistoryTest.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/patch/EGitPatchHistoryTest.java b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/patch/EGitPatchHistoryTest.java index da997f98a..3f9ef1250 100644 --- a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/patch/EGitPatchHistoryTest.java +++ b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/patch/EGitPatchHistoryTest.java @@ -202,28 +202,28 @@ static abstract class CommitReader { } void read() throws IOException, InterruptedException { - final BufferedReader in = new BufferedReader(new InputStreamReader( - proc.getInputStream(), ISO_8859_1)); - String commitId = null; - TemporaryBuffer buf = null; - for (;;) { - String line = in.readLine(); - if (line == null) - break; - if (line.startsWith("commit ")) { - if (buf != null) { - buf.close(); - onCommit(commitId, buf.toByteArray()); - buf.destroy(); + try (BufferedReader in = new BufferedReader( + new InputStreamReader(proc.getInputStream(), ISO_8859_1))) { + String commitId = null; + TemporaryBuffer buf = null; + for (;;) { + String line = in.readLine(); + if (line == null) + break; + if (line.startsWith("commit ")) { + if (buf != null) { + buf.close(); + onCommit(commitId, buf.toByteArray()); + buf.destroy(); + } + commitId = line.substring("commit ".length()); + buf = new TemporaryBuffer.LocalFile(null); + } else if (buf != null) { + buf.write(line.getBytes(ISO_8859_1)); + buf.write('\n'); } - commitId = line.substring("commit ".length()); - buf = new TemporaryBuffer.LocalFile(null); - } else if (buf != null) { - buf.write(line.getBytes(ISO_8859_1)); - buf.write('\n'); } } - in.close(); assertEquals(0, proc.waitFor()); proc = null; }