motiejus
/
jgit
1
Fork 0
Code Releases Activity

ArchiveCommand: Create archive output stream in try-with-resource 

Change-Id: I72f4d303945275d400723aa17212b302e051dc15
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-03-05 20:19:25 +09:00
parent 40868386db
commit 9e4a455f9b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
View File

@ -392,9 +392,10 @@ public ArchiveCommand(Repository repo) {
private <T extends Closeable> OutputStream writeArchive(Format<T> fmt) {
try {
try (TreeWalk walk = new TreeWalk(repo);
RevWalk rw = new RevWalk(walk.getObjectReader())) {
RevWalk rw = new RevWalk(walk.getObjectReader());
T outa = fmt.createArchiveOutputStream(out,
formatOptions)) {
String pfx = prefix == null ? "" : prefix; //$NON-NLS-1$
T outa = fmt.createArchiveOutputStream(out, formatOptions);
MutableObjectId idBuf = new MutableObjectId();
ObjectReader reader = walk.getObjectReader();
@ -427,7 +428,6 @@ private <T extends Closeable> OutputStream writeArchive(Format<T> fmt) {
walk.getObjectId(idBuf, 0);
fmt.putEntry(outa, tree, name, mode, reader.open(idBuf));
}
outa.close();
return out;
} finally {
out.close();