github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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

stable-3.2
Dave Borowitz 11 years ago committed by Gerrit Code Review @ Eclipse.org
parent
da9db6b20c 3467e865ac
commit
17dc02a579
2 changed files with 4 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
  2. 7
      org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/ZipFormat.java

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

@ -93,11 +93,8 @@ public class TarFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
} }
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
Unescape View File

@ -82,11 +82,8 @@ public class ZipFormat implements ArchiveCommand.Format<ArchiveOutputStream> {
} }
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() {

Write Preview
Loading…
Cancel
Save