diff options
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java index 9014aaf1a2..713866dc53 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java @@ -365,13 +365,11 @@ public class ArchiveCommand extends GitCommand<OutputStream> { private <T extends Closeable> OutputStream writeArchive(Format<T> fmt) { final String pfx = prefix == null ? "" : prefix; //$NON-NLS-1$ - final TreeWalk walk = new TreeWalk(repo); - try { + try (final TreeWalk walk = new TreeWalk(repo)) { final T outa = fmt.createArchiveOutputStream(out, formatOptions); - try { + try (final RevWalk rw = new RevWalk(walk.getObjectReader())) { final MutableObjectId idBuf = new MutableObjectId(); final ObjectReader reader = walk.getObjectReader(); - final RevWalk rw = new RevWalk(walk.getObjectReader()); walk.reset(rw.parseTree(tree)); if (!paths.isEmpty()) @@ -405,8 +403,6 @@ public class ArchiveCommand extends GitCommand<OutputStream> { // TODO(jrn): Throw finer-grained errors. throw new JGitInternalException( JGitText.get().exceptionCaughtDuringExecutionOfArchiveCommand, e); - } finally { - walk.release(); } } |