Improve cpio tests, submitted by Christian Grobmeier, COMPRESS-28
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/trunk@758588 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
index fb3f305..e66f58a 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
@@ -39,14 +39,13 @@
* <p/>
* <code><pre>
* CpioArchiveOutputStream out = new CpioArchiveOutputStream(
- * new FileOutputStream(new File("test.cpio")));
+ * new FileOutputStream(new File("test.cpio")));
* CpioArchiveEntry entry = new CpioArchiveEntry();
* entry.setName("testfile");
* String contents = "12345";
* entry.setFileSize(contents.length());
* out.putNextEntry(entry);
* out.write(testContents.getBytes());
- * out.finish();
* out.close();
* </pre></code>
* <p/>
@@ -150,7 +149,7 @@
public void putNextEntry(final CpioArchiveEntry e) throws IOException {
ensureOpen();
if (this.cpioEntry != null) {
- closeEntry(); // close previous entry
+ closeArchiveEntry(); // close previous entry
}
if (e.getTime() == -1) {
e.setTime(System.currentTimeMillis());
@@ -242,15 +241,13 @@
pad(entry.getHeaderSize() + entry.getName().length() + 1, 2);
}
- /**
- * Closes the current CPIO entry and positions the stream for writing the
- * next entry.
+ /*(non-Javadoc)
*
- * @throws IOException
- * if an I/O error has occurred or if a CPIO file error has
- * occurred
+ * @see
+ * org.apache.commons.compress.archivers.ArchiveOutputStream#closeArchiveEntry
+ * ()
*/
- public void closeEntry() throws IOException {
+ public void closeArchiveEntry() throws IOException {
ensureOpen();
if (this.cpioEntry.getSize() != this.written) {
@@ -327,14 +324,14 @@
return;
}
if (this.cpioEntry != null) {
- closeEntry();
+ closeArchiveEntry();
}
this.cpioEntry = new CpioArchiveEntry(this.entryFormat);
this.cpioEntry.setMode(0);
this.cpioEntry.setName("TRAILER!!!");
this.cpioEntry.setNumberOfLinks(1);
writeHeader(this.cpioEntry);
- closeEntry();
+ closeArchiveEntry();
}
/**
@@ -346,6 +343,7 @@
*/
public void close() throws IOException {
if (!this.closed) {
+ this.finish();
super.close();
this.closed = true;
}
@@ -398,17 +396,6 @@
* (non-Javadoc)
*
* @see
- * org.apache.commons.compress.archivers.ArchiveOutputStream#closeArchiveEntry
- * ()
- */
- public void closeArchiveEntry() throws IOException {
- this.closeEntry();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
* org.apache.commons.compress.archivers.ArchiveOutputStream#putArchiveEntry
* (org.apache.commons.compress.archivers.ArchiveEntry)
*/