Close unfinished archive entries on error

Otherwise the underlying error is hidden by an "IOException: This
archives contains unclosed entries." when jgit tries to close the
archive.

Reported-by: Dave Borowitz <dborowitz@google.com>
Change-Id: I594dcdf366200b802e13e5a645fe06597feb7bb4
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 23f4beda1448961a81fbc6333c086ac38f9bb7c5..cd98c03393f0f10b407578aa022b03007899a286 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,8 +93,11 @@ public class TarFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
                }
                entry.setSize(loader.getSize());
                out.putArchiveEntry(entry);
-               loader.copyTo(out);
-               out.closeArchiveEntry();
+                try {
+                       loader.copyTo(out);
+               } finally {
+                       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 00c962bc9827f71beef9498cb4459420d8d8fcd7..be7264bd8b386e3fa3d50ea283e7912c717f6d31 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,8 +82,11 @@ public class ZipFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
                }
                entry.setSize(loader.getSize());
                out.putArchiveEntry(entry);
-               loader.copyTo(out);
-               out.closeArchiveEntry();
+               try {
+                       loader.copyTo(out);
+               } finally {
+                       out.closeArchiveEntry();
+               }
        }
 
        public Iterable<String> suffixes() {