Revert "Close unfinished archive entries on error"
This reverts commit 75d9b31f14
.
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>
This commit is contained in:
parent
8a51c4453d
commit
3467e865ac
|
@ -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() {
|
||||||
|
|
|
@ -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() {
|
||||||
|
|
Loading…
Reference in New Issue