Browse Source

GetTextTest: Open InputStream in try-with-resource

Change-Id: I3b68686de2d852b1f0b19c267a4e527229b40316
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.11
David Pursehouse 7 years ago
parent
commit
c6ea82b9cc
  1. 26
      org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/GetTextTest.java

26
org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/GetTextTest.java

@ -123,28 +123,24 @@ public class GetTextTest {
private Patch parseTestPatchFile() throws IOException {
final String patchFile = JGitTestUtil.getName() + ".patch";
final InputStream in = getClass().getResourceAsStream(patchFile);
if (in == null) {
fail("No " + patchFile + " test vector");
return null; // Never happens
}
try {
try (InputStream in = getClass().getResourceAsStream(patchFile)) {
if (in == null) {
fail("No " + patchFile + " test vector");
return null; // Never happens
}
final Patch p = new Patch();
p.parse(in);
return p;
} finally {
in.close();
}
}
private String readTestPatchFile(final Charset cs) throws IOException {
final String patchFile = JGitTestUtil.getName() + ".patch";
final InputStream in = getClass().getResourceAsStream(patchFile);
if (in == null) {
fail("No " + patchFile + " test vector");
return null; // Never happens
}
try {
try (InputStream in = getClass().getResourceAsStream(patchFile)) {
if (in == null) {
fail("No " + patchFile + " test vector");
return null; // Never happens
}
final InputStreamReader r = new InputStreamReader(in, cs);
char[] tmp = new char[2048];
final StringBuilder s = new StringBuilder();
@ -152,8 +148,6 @@ public class GetTextTest {
while ((n = r.read(tmp)) > 0)
s.append(tmp, 0, n);
return s.toString();
} finally {
in.close();
}
}
}

Loading…
Cancel
Save