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:
parent
40868386db
commit
9e4a455f9b
|
@ -392,9 +392,10 @@ public ArchiveCommand(Repository repo) {
|
||||||
private <T extends Closeable> OutputStream writeArchive(Format<T> fmt) {
|
private <T extends Closeable> OutputStream writeArchive(Format<T> fmt) {
|
||||||
try {
|
try {
|
||||||
try (TreeWalk walk = new TreeWalk(repo);
|
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$
|
String pfx = prefix == null ? "" : prefix; //$NON-NLS-1$
|
||||||
T outa = fmt.createArchiveOutputStream(out, formatOptions);
|
|
||||||
MutableObjectId idBuf = new MutableObjectId();
|
MutableObjectId idBuf = new MutableObjectId();
|
||||||
ObjectReader reader = walk.getObjectReader();
|
ObjectReader reader = walk.getObjectReader();
|
||||||
|
|
||||||
|
@ -427,7 +428,6 @@ private <T extends Closeable> OutputStream writeArchive(Format<T> fmt) {
|
||||||
walk.getObjectId(idBuf, 0);
|
walk.getObjectId(idBuf, 0);
|
||||||
fmt.putEntry(outa, tree, name, mode, reader.open(idBuf));
|
fmt.putEntry(outa, tree, name, mode, reader.open(idBuf));
|
||||||
}
|
}
|
||||||
outa.close();
|
|
||||||
return out;
|
return out;
|
||||||
} finally {
|
} finally {
|
||||||
out.close();
|
out.close();
|
||||||
|
|
Loading…
Reference in New Issue