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

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

*** 1,7 ****
  /*
!  * Copyright (c) 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) 2013, 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
*** 27,39 ****
  
  import java.nio.file.attribute.FileTime;
  import java.util.Date;
  import java.util.concurrent.TimeUnit;
  
- import static java.util.zip.ZipConstants.*;
- import static java.util.zip.ZipConstants64.*;
- 
  class ZipUtils {
  
      // used to adjust values between Windows and java epoch
      private static final long WINDOWS_EPOCH_IN_MICROSECONDS = -11644473600000000L;
  
--- 27,36 ----
*** 67,77 ****
      }
  
      /**
       * Converts DOS time to Java time (number of milliseconds since epoch).
       */
!     public static long dosToJavaTime(long dtime) {
          @SuppressWarnings("deprecation") // Use of date constructor.
          Date d = new Date((int)(((dtime >> 25) & 0x7f) + 80),
                            (int)(((dtime >> 21) & 0x0f) - 1),
                            (int)((dtime >> 16) & 0x1f),
                            (int)((dtime >> 11) & 0x1f),
--- 64,74 ----
      }
  
      /**
       * Converts DOS time to Java time (number of milliseconds since epoch).
       */
!     private static long dosToJavaTime(long dtime) {
          @SuppressWarnings("deprecation") // Use of date constructor.
          Date d = new Date((int)(((dtime >> 25) & 0x7f) + 80),
                            (int)(((dtime >> 21) & 0x0f) - 1),
                            (int)((dtime >> 16) & 0x1f),
                            (int)((dtime >> 11) & 0x1f),
*** 79,103 ****
                            (int)((dtime << 1) & 0x3e));
          return d.getTime();
      }
  
      /**
       * Converts Java time to DOS time.
       */
      @SuppressWarnings("deprecation") // Use of date methods
!     public static long javaToDosTime(long time) {
          Date d = new Date(time);
          int year = d.getYear() + 1900;
          if (year < 1980) {
!             return (1 << 21) | (1 << 16);
          }
          return (year - 1980) << 25 | (d.getMonth() + 1) << 21 |
                 d.getDate() << 16 | d.getHours() << 11 | d.getMinutes() << 5 |
                 d.getSeconds() >> 1;
      }
  
      /**
       * Fetches unsigned 16-bit value from byte array at specified offset.
       * The bytes are assumed to be in Intel (little-endian) byte order.
       */
      public static final int get16(byte b[], int off) {
          return Byte.toUnsignedInt(b[off]) | (Byte.toUnsignedInt(b[off+1]) << 8);
--- 76,129 ----
                            (int)((dtime << 1) & 0x3e));
          return d.getTime();
      }
  
      /**
+      * Converts extended DOS time to Java time, where up to 1999 milliseconds
+      * might be encoded into the upper half of the returned long.
+      *
+      * @param xdostime the extended DOS time value
+      * @return milliseconds since epoch
+      */
+     public static long extendedDosToJavaTime(long xdostime) {
+         long time = dosToJavaTime(xdostime);
+         return time + (xdostime >> 32);
+     }
+ 
+     /**
       * Converts Java time to DOS time.
       */
      @SuppressWarnings("deprecation") // Use of date methods
!     private static long javaToDosTime(long time) {
          Date d = new Date(time);
          int year = d.getYear() + 1900;
          if (year < 1980) {
!             return ZipEntry.DOSTIME_BEFORE_1980;
          }
          return (year - 1980) << 25 | (d.getMonth() + 1) << 21 |
                 d.getDate() << 16 | d.getHours() << 11 | d.getMinutes() << 5 |
                 d.getSeconds() >> 1;
      }
  
      /**
+      * Converts Java time to DOS time, encoding any milliseconds lost
+      * in the conversion into the upper half of the returned long.
+      *
+      * @param time milliseconds since epoch
+      * @return DOS time with 2s remainder encoded into upper half
+      */
+     public static long javaToExtendedDosTime(long time) {
+         if (time < 0) {
+             return ZipEntry.DOSTIME_BEFORE_1980;
+         }
+         long dostime = javaToDosTime(time);
+         return (dostime != ZipEntry.DOSTIME_BEFORE_1980)
+                 ? dostime + ((time % 2000) << 32)
+                 : ZipEntry.DOSTIME_BEFORE_1980;
+     }
+ 
+     /**
       * Fetches unsigned 16-bit value from byte array at specified offset.
       * The bytes are assumed to be in Intel (little-endian) byte order.
       */
      public static final int get16(byte b[], int off) {
          return Byte.toUnsignedInt(b[off]) | (Byte.toUnsignedInt(b[off+1]) << 8);