src/java.base/share/classes/java/util/zip/ZipOutputStream.java

rev 11478 : 8073497: Lazy conversion of ZipEntry time
Reviewed-by: sherman, plevart

*** 1,7 ****
  /*
!  * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 59,69 ****
                      "jdk.util.zip.inhibitZip64", "false")));
  
      private static class XEntry {
          final ZipEntry entry;
          final long offset;
-         long dostime;    // last modification time in msdos format
          public XEntry(ZipEntry entry, long offset) {
              this.entry = entry;
              this.offset = offset;
          }
      }
--- 59,68 ----
*** 190,200 ****
      public void putNextEntry(ZipEntry e) throws IOException {
          ensureOpen();
          if (current != null) {
              closeEntry();       // close previous entry
          }
!         if (e.time == -1) {
              // by default, do NOT use extended timestamps in extra
              // data, for now.
              e.setTime(System.currentTimeMillis());
          }
          if (e.method == -1) {
--- 189,199 ----
      public void putNextEntry(ZipEntry e) throws IOException {
          ensureOpen();
          if (current != null) {
              closeEntry();       // close previous entry
          }
!         if (e.xdostime == -1) {
              // by default, do NOT use extended timestamps in extra
              // data, for now.
              e.setTime(System.currentTimeMillis());
          }
          if (e.method == -1) {
*** 387,408 ****
          ZipEntry e = xentry.entry;
          int flag = e.flag;
          boolean hasZip64 = false;
          int elen = getExtraLen(e.extra);
  
-         // keep a copy of dostime for writeCEN(), otherwise the tz
-         // sensitive local time entries in loc and cen might be
-         // different if the default tz get changed during writeLOC()
-         // and writeCEN()
-         xentry.dostime = javaToDosTime(e.time);
- 
          writeInt(LOCSIG);               // LOC header signature
          if ((flag & 8) == 8) {
              writeShort(version(e));     // version needed to extract
              writeShort(flag);           // general purpose bit flag
              writeShort(e.method);       // compression method
!             writeInt(xentry.dostime);   // last modification time
              // store size, uncompressed size, and crc-32 in data descriptor
              // immediately following compressed entry data
              writeInt(0);
              writeInt(0);
              writeInt(0);
--- 386,401 ----
          ZipEntry e = xentry.entry;
          int flag = e.flag;
          boolean hasZip64 = false;
          int elen = getExtraLen(e.extra);
  
          writeInt(LOCSIG);               // LOC header signature
          if ((flag & 8) == 8) {
              writeShort(version(e));     // version needed to extract
              writeShort(flag);           // general purpose bit flag
              writeShort(e.method);       // compression method
!             writeInt(e.xdostime);       // last modification time
              // store size, uncompressed size, and crc-32 in data descriptor
              // immediately following compressed entry data
              writeInt(0);
              writeInt(0);
              writeInt(0);
*** 413,423 ****
              } else {
                  writeShort(version(e)); // version needed to extract
              }
              writeShort(flag);           // general purpose bit flag
              writeShort(e.method);       // compression method
!             writeInt(xentry.dostime);   // last modification time
              writeInt(e.crc);            // crc-32
              if (hasZip64) {
                  writeInt(ZIP64_MAGICVAL);
                  writeInt(ZIP64_MAGICVAL);
                  elen += 20;        //headid(2) + size(2) + size(8) + csize(8)
--- 406,416 ----
              } else {
                  writeShort(version(e)); // version needed to extract
              }
              writeShort(flag);           // general purpose bit flag
              writeShort(e.method);       // compression method
!             writeInt(e.xdostime);       // last modification time
              writeInt(e.crc);            // crc-32
              if (hasZip64) {
                  writeInt(ZIP64_MAGICVAL);
                  writeInt(ZIP64_MAGICVAL);
                  elen += 20;        //headid(2) + size(2) + size(8) + csize(8)
*** 520,532 ****
              writeShort(version);    // version made by
              writeShort(version);    // version needed to extract
          }
          writeShort(flag);           // general purpose bit flag
          writeShort(e.method);       // compression method
!         // use the copy in xentry, which has been converted
!         // from e.time in writeLOC()
!         writeInt(xentry.dostime);   // last modification time
          writeInt(e.crc);            // crc-32
          writeInt(csize);            // compressed size
          writeInt(size);             // uncompressed size
          byte[] nameBytes = zc.getBytes(e.name);
          writeShort(nameBytes.length);
--- 513,523 ----
              writeShort(version);    // version made by
              writeShort(version);    // version needed to extract
          }
          writeShort(flag);           // general purpose bit flag
          writeShort(e.method);       // compression method
!         writeInt(e.xdostime);       // last modification time
          writeInt(e.crc);            // crc-32
          writeInt(csize);            // compressed size
          writeInt(size);             // uncompressed size
          byte[] nameBytes = zc.getBytes(e.name);
          writeShort(nameBytes.length);