Do not close ArchiveOutputStream on error

If we encounter an I/O error while writing an archive (for example due
to the reader of an HTTP stream closing the connection), the result is
an archive with unclosed entries, causing
TarArchiveOutputStream.finish() to throw IOException("This archives
contains unclosed entries"), hiding the IOException that caused the
early termination.

The unclosed entries are fine: the same exception that occured in the
first place will probably prevent closing the entries before finishing
this partial archive that should be discarded anyway.

It would be nicer to call TarArchiveOutputStream.finish and leave the
underlying OutputStream unclosed --- all callers close it already ---
but that would be a more invasive change so we hold off for now.

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

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 e8e4ffd754def50c95bfd851b2aaf2bb00efae5f..42d0f6512d5253cfaf8e23b67b74adbcbe936aad 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
@@ -111,7 +111,6 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
         *              for (...) {
         *                      format.putEntry(out, path, mode, repo.open(objectId));
         *              }
-        *      } finally {
         *              out.close();
         *      }
         *
@@ -287,8 +286,9 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
                                        walk.getObjectId(idBuf, 0);
                                        fmt.putEntry(outa, name, mode, reader.open(idBuf));
                                }
-                       } finally {
                                outa.close();
+                       } finally {
+                               out.close();
                        }
                        return out;
                } catch (IOException e) {