commit | d495f26d9593e490b256391255cc8ba907d87f1e | [log] [tgz] |
---|---|---|
author | Stefan Bodewig <bodewig@apache.org> | Sun Oct 06 20:03:08 2013 +0000 |
committer | Stefan Bodewig <bodewig@apache.org> | Sun Oct 06 20:03:08 2013 +0000 |
tree | 4965c303376ad2c330d0b6180a95d562e473be20 | |
parent | 0317b955b296f0e0db08c1a12ac17ae1d943a502 [diff] |
backwards incompatible changes git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/trunk@1529673 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java index 405f305..c7e8e52 100644 --- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
@@ -484,7 +484,7 @@ } @Override - public CpioArchiveEntry getNextEntry() throws IOException { + public ArchiveEntry getNextEntry() throws IOException { return getNextCPIOEntry(); }
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java index 6ea6e97..d8c0591 100644 --- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
@@ -606,7 +606,7 @@ * * @return The current Archive Entry */ - public ArchiveEntry getCurrentEntry() { + public TarArchiveEntry getCurrentEntry() { return currEntry; }
diff --git a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java index e7112df..8efc25b 100644 --- a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
@@ -35,7 +35,7 @@ CpioArchiveEntry entry; StringBuilder result = new StringBuilder(); - while ((entry = in.getNextEntry()) != null) { + while ((entry = (CpioArchiveEntry) in.getNextEntry()) != null) { result.append(entry.getName()); int tmp; while ((tmp = in.read()) != -1) {