motiejus
/
jgit
1
Fork 0
Code Releases Activity

EGitPatchHistoryTest: Open BufferedReader in try-with-resource 

Change-Id: I74aede463c7b0a478a1e0e8b680c206d3964061d
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-03-06 16:49:23 +09:00
parent 159388b1a6
commit 209bb6ea94
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
org.eclipse.jgit.test/exttst/org/eclipse/jgit/patch/EGitPatchHistoryTest.java
View File

@ -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;
}