Author: bodewig Date: Sun Oct 6 20:03:08 2013 New Revision: 1529673 URL: http://svn.apache.org/r1529673 Log: backwards incompatible changes
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java?rev=1529673&r1=1529672&r2=1529673&view=diff ============================================================================== --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java (original) +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java Sun Oct 6 20:03:08 2013 @@ -484,7 +484,7 @@ public class CpioArchiveInputStream exte } @Override - public CpioArchiveEntry getNextEntry() throws IOException { + public ArchiveEntry getNextEntry() throws IOException { return getNextCPIOEntry(); } Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java?rev=1529673&r1=1529672&r2=1529673&view=diff ============================================================================== --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java (original) +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java Sun Oct 6 20:03:08 2013 @@ -606,7 +606,7 @@ public class TarArchiveInputStream exten * * @return The current Archive Entry */ - public ArchiveEntry getCurrentEntry() { + public TarArchiveEntry getCurrentEntry() { return currEntry; } Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java?rev=1529673&r1=1529672&r2=1529673&view=diff ============================================================================== --- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java (original) +++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java Sun Oct 6 20:03:08 2013 @@ -35,7 +35,7 @@ public class CpioArchiveInputStreamTest 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) {