motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Revert "Close unfinished archive entries on error""

This commit is contained in:
Dave Borowitz 2013-11-01 23:12:29 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent da9db6b20c 3467e865ac
commit 17dc02a579
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
View File

@ -93,11 +93,8 @@ public void putEntry(ArchiveOutputStream out,
} }
entry.setSize(loader.getSize()); entry.setSize(loader.getSize());
out.putArchiveEntry(entry); out.putArchiveEntry(entry);
try { loader.copyTo(out);
loader.copyTo(out); out.closeArchiveEntry();
} finally {
out.closeArchiveEntry();
}
} }
public Iterable<String> suffixes() { public Iterable<String> suffixes() {

7
org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java
View File

@ -82,11 +82,8 @@ public void putEntry(ArchiveOutputStream out,
} }
entry.setSize(loader.getSize()); entry.setSize(loader.getSize());
out.putArchiveEntry(entry); out.putArchiveEntry(entry);
try { loader.copyTo(out);
loader.copyTo(out); out.closeArchiveEntry();
} finally {
out.closeArchiveEntry();
}
} }
public Iterable<String> suffixes() { public Iterable<String> suffixes() {