archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8336844: ZipConstants64 defines duplicate constants EXTID_ZIP64 and ZIP64_EXTID

Browse source 
Reviewed-by: jpai, vtewari, lancea
This commit is contained in:
Liam Miller-Cushon 2024-07-22 17:20:58 +00:00
parent c1c9704268
commit 8438c5853f
6 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/util/zip/ZipOutputStream.java
View file

@ -485,7 +485,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
writeShort(elen);
writeBytes(nameBytes, 0, nameBytes.length);
if (hasZip64) {
writeShort(ZIP64_EXTID);
writeShort(EXTID_ZIP64);
writeShort(16);
writeLong(e.size);
writeLong(e.csize);
@ -643,7 +643,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
// take care of EXTID_ZIP64 and EXTID_EXTT
if (hasZip64) {
writeShort(ZIP64_EXTID);// Zip64 extra
writeShort(EXTID_ZIP64);// Zip64 extra
writeShort(elenZIP64);
if (size == ZIP64_MAGICVAL)
writeLong(e.size);