You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2011/07/26 07:31:17 UTC
svn commit: r1150988 -
/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
Author: bodewig
Date: Tue Jul 26 05:31:16 2011
New Revision: 1150988
URL: http://svn.apache.org/viewvc?rev=1150988&view=rev
Log:
ignore 'version made by' and use the Zip64 field if present
Modified:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
Modified: commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java?rev=1150988&r1=1150987&r2=1150988&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java (original)
+++ commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java Tue Jul 26 05:31:16 2011
@@ -157,7 +157,6 @@ public class ZipArchiveInputStream exten
current = new ZipArchiveEntry();
int versionMadeBy = ZipShort.getValue(lfh, off);
- usesZip64 = (versionMadeBy & BYTE_MASK) >= ZIP64_MIN_VERSION;
off += SHORT;
current.setPlatform((versionMadeBy >> ZipFile.BYTE_SHIFT)
& ZipFile.NIBLET_MASK);
@@ -211,16 +210,11 @@ public class ZipArchiveInputStream exten
ZipUtil.setNameAndCommentFromExtraFields(current, fileName, null);
}
- Zip64ExtendedInformationExtraField z64 = null;
- if (usesZip64) {
- z64 = (Zip64ExtendedInformationExtraField)
- current.getExtraField(Zip64ExtendedInformationExtraField
- .HEADER_ID);
- if (z64 == null) {
- // "version made by" >= 4.5 for some other reason than ZIP64
- usesZip64 = false;
- }
- }
+ Zip64ExtendedInformationExtraField z64 =
+ (Zip64ExtendedInformationExtraField)
+ current.getExtraField(Zip64ExtendedInformationExtraField
+ .HEADER_ID);
+ usesZip64 = z64 != null;
if (!hasDataDescriptor) {
if (usesZip64 && (cSize.equals(ZipLong.ZIP64_MAGIC)
|| size.equals(ZipLong.ZIP64_MAGIC))