Revert "Close unfinished archive entries on error"

This reverts commit 75d9b31f14d6226a535a80c05cffda29e55d2ceb.
Now that we do not try to close the ArchiveOutputStream in the error
path, there is no need to artificially close partial entries from
before the error.

Change-Id: I1f1cb08ec4e9b14c79bf4621f3fa959463034b82
Signed-off-by: Jonathan Nieder <jrn@google.com>

diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
index f90573ebc86caa7e74438ea2ce46774733b19bdb..23f4beda1448961a81fbc6333c086ac38f9bb7c5 100644 (file)
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
@@ -93,11 +93,8 @@ public class TarFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
                }
                entry.setSize(loader.getSize());
                out.putArchiveEntry(entry);
-               try {
-                       loader.copyTo(out);
-               } finally {
-                       out.closeArchiveEntry();
-               }
+               loader.copyTo(out);
+               out.closeArchiveEntry();
        }
 
        public Iterable<String> suffixes() {

diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java
index be7264bd8b386e3fa3d50ea283e7912c717f6d31..00c962bc9827f71beef9498cb4459420d8d8fcd7 100644 (file)
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java
@@ -82,11 +82,8 @@ public class ZipFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
                }
                entry.setSize(loader.getSize());
                out.putArchiveEntry(entry);
-               try {
-                       loader.copyTo(out);
-               } finally {
-                       out.closeArchiveEntry();
-               }
+               loader.copyTo(out);
+               out.closeArchiveEntry();
        }
 
        public Iterable<String> suffixes() {