Author: ebourg
Date: Thu Dec 19 13:12:28 2013
New Revision: 1552309
URL: http://svn.apache.org/r1552309
Log:
Changed canReadEntryData() to support shrunk entries
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java?rev=1552309&r1=1552308&r2=1552309&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
Thu Dec 19 13:12:28 2013
@@ -342,7 +342,6 @@ public class ZipArchiveInputStream exten
if (ae instanceof ZipArchiveEntry) {
ZipArchiveEntry ze = (ZipArchiveEntry) ae;
return ZipUtil.canHandleEntryData(ze)
- && ze.getMethod() != ZipMethod.UNSHRINKING.getCode()
&& supportsDataDescriptorFor(ze);
}
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java?rev=1552309&r1=1552308&r2=1552309&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java
Thu Dec 19 13:12:28 2013
@@ -129,6 +129,7 @@ public class ZipArchiveInputStreamTest {
ZipArchiveEntry entry = in.getNextZipEntry();
assertEquals("method", ZipMethod.UNSHRINKING.getCode(),
entry.getMethod());
+ assertTrue(in.canReadEntryData(entry));
FileInputStream original = new FileInputStream(getFile("test1.xml"));
try {
@@ -139,6 +140,7 @@ public class ZipArchiveInputStreamTest {
entry = in.getNextZipEntry();
assertEquals("method", ZipMethod.UNSHRINKING.getCode(),
entry.getMethod());
+ assertTrue(in.canReadEntryData(entry));
original = new FileInputStream(getFile("test2.xml"));
try {
