opendev/gerrit
Code Issues Proposed changes

GetPureRevert: Close AutoCloseable DiffFormatter

Browse Source 
Change-Id: I8ee4a1fed5e04b51641bf5a2262a508f02cee68b
This commit is contained in:
Dave Borowitz
2017-09-08 07:49:40 -04:00
parent 15ab67f877
commit 75868b091c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/change/GetPureRevert.java
View File

@@ -131,13 +131,14 @@ public class GetPureRevert implements RestReadView<ChangeResource> {
// Any differences between claimed original's parent and the rebase result indicate that the // Any differences between claimed original's parent and the rebase result indicate that the
// claimedRevert is not a pure revert but made content changes // claimedRevert is not a pure revert but made content changes
DiffFormatter df = new DiffFormatter(new ByteArrayOutputStream()); try (DiffFormatter df = new DiffFormatter(new ByteArrayOutputStream())) {
df.setRepository(repo); df.setRepository(repo);
List<DiffEntry> entries = List<DiffEntry> entries =
df.scan(claimedOriginalCommit.getParent(0), merger.getResultTreeId()); df.scan(claimedOriginalCommit.getParent(0), merger.getResultTreeId());
return new PureRevertInfo(entries.isEmpty()); return new PureRevertInfo(entries.isEmpty());
} }
} }
}
public GetPureRevert setClaimedOriginal(String claimedOriginal) { public GetPureRevert setClaimedOriginal(String claimedOriginal) {
this.claimedOriginal = claimedOriginal; this.claimedOriginal = claimedOriginal;