motiejus
/
jgit
1
Fork 0
Code Releases Activity

WalkRemoteObjectDatabase: Open auto-closeable resources in try-with-resource 

Change-Id: Ie4f67ca8cab1031089782f202588b08cc157dd79
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-03-05 17:15:04 +09:00
parent 99c187a5da
commit fa9ee83697
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java
View File

@ -264,11 +264,8 @@ OutputStream writeFile(final String path, final ProgressMonitor monitor,
* failed, possibly due to permissions or remote disk full, etc. * failed, possibly due to permissions or remote disk full, etc.
*/ */
void writeFile(final String path, final byte[] data) throws IOException { void writeFile(final String path, final byte[] data) throws IOException {
final OutputStream os = writeFile(path, null, null); try (OutputStream os = writeFile(path, null, null)) {
try {
os.write(data); os.write(data);
} finally {
os.close();
} }
} }
@ -394,8 +391,7 @@ BufferedReader openReader(final String path) throws IOException {
*/ */
Collection<WalkRemoteObjectDatabase> readAlternates(final String listPath) Collection<WalkRemoteObjectDatabase> readAlternates(final String listPath)
throws IOException { throws IOException {
final BufferedReader br = openReader(listPath); try (BufferedReader br = openReader(listPath)) {
try {
final Collection<WalkRemoteObjectDatabase> alts = new ArrayList<>(); final Collection<WalkRemoteObjectDatabase> alts = new ArrayList<>();
for (;;) { for (;;) {
String line = br.readLine(); String line = br.readLine();
@ -406,8 +402,6 @@ Collection<WalkRemoteObjectDatabase> readAlternates(final String listPath)
alts.add(openAlternate(line)); alts.add(openAlternate(line));
} }
return alts; return alts;
} finally {
br.close();
} }
} }
@ -422,14 +416,8 @@ Collection<WalkRemoteObjectDatabase> readAlternates(final String listPath)
*/ */
protected void readPackedRefs(final Map<String, Ref> avail) protected void readPackedRefs(final Map<String, Ref> avail)
throws TransportException { throws TransportException {
try { try (BufferedReader br = openReader(ROOT_DIR + Constants.PACKED_REFS)) {
final BufferedReader br = openReader(ROOT_DIR
+ Constants.PACKED_REFS);
try {
readPackedRefsImpl(avail, br); readPackedRefsImpl(avail, br);
} finally {
br.close();
}
} catch (FileNotFoundException notPacked) { } catch (FileNotFoundException notPacked) {
// Perhaps it wasn't worthwhile, or is just an older repository. // Perhaps it wasn't worthwhile, or is just an older repository.
} catch (IOException e) { } catch (IOException e) {