Fix resource leak in DiffFormatter
- close RevWalk allocated in scan() - replace use of deprecated ObjectReader.release() method Change-Id: I41b2b10a1a44270a6ceaa1741e996c0921439852 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
81c84c088f
commit
ff0a7b719e
|
@ -173,7 +173,7 @@ protected OutputStream getOutputStream() {
|
||||||
*/
|
*/
|
||||||
public void setRepository(Repository repository) {
|
public void setRepository(Repository repository) {
|
||||||
if (reader != null)
|
if (reader != null)
|
||||||
reader.release();
|
reader.close();
|
||||||
|
|
||||||
db = repository;
|
db = repository;
|
||||||
reader = db.newObjectReader();
|
reader = db.newObjectReader();
|
||||||
|
@ -422,11 +422,12 @@ public List<DiffEntry> scan(AnyObjectId a, AnyObjectId b)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
assertHaveRepository();
|
assertHaveRepository();
|
||||||
|
|
||||||
RevWalk rw = new RevWalk(reader);
|
try (RevWalk rw = new RevWalk(reader)) {
|
||||||
RevTree aTree = a != null ? rw.parseTree(a) : null;
|
RevTree aTree = a != null ? rw.parseTree(a) : null;
|
||||||
RevTree bTree = b != null ? rw.parseTree(b) : null;
|
RevTree bTree = b != null ? rw.parseTree(b) : null;
|
||||||
return scan(aTree, bTree);
|
return scan(aTree, bTree);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine the differences between two trees.
|
* Determine the differences between two trees.
|
||||||
|
|
Loading…
Reference in New Issue