Merge "Use try-with-resource to close resources in DiffCommand"
This commit is contained in:
commit
15a95e3911
|
@ -124,11 +124,8 @@ public List<DiffEntry> call() throws GitAPIException {
|
|||
if (head == null)
|
||||
throw new NoHeadException(JGitText.get().cannotReadTree);
|
||||
CanonicalTreeParser p = new CanonicalTreeParser();
|
||||
ObjectReader reader = repo.newObjectReader();
|
||||
try {
|
||||
try (ObjectReader reader = repo.newObjectReader()) {
|
||||
p.reset(reader, head);
|
||||
} finally {
|
||||
reader.release();
|
||||
}
|
||||
oldTree = p;
|
||||
}
|
||||
|
@ -159,7 +156,7 @@ public List<DiffEntry> call() throws GitAPIException {
|
|||
} catch (IOException e) {
|
||||
throw new JGitInternalException(e.getMessage(), e);
|
||||
} finally {
|
||||
diffFmt.release();
|
||||
diffFmt.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue