6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive

Reviewed-by: darcy

langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java

@@ -32,6 +32,7 @@ import java.io.RandomAccessFile;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -1307,11 +1308,18 @@ public class ZipFileIndex {
             return javatime;
         }
 
-        // From java.util.zip
-        private static long dosToJavaTime(int nativetime) {
-            // Bootstrap build problems prevent me from using the code directly
-            // Convert the raw/native time to a long for now
-            return (long)nativetime;
+        // based on dosToJavaTime in java.util.Zip, but avoiding the
+        // use of deprecated Date constructor
+        private static long dosToJavaTime(int dtime) {
+            Calendar c = Calendar.getInstance();
+            c.set(Calendar.YEAR,        ((dtime >> 25) & 0x7f) + 1980);
+            c.set(Calendar.MONTH,       ((dtime >> 21) & 0x0f) - 1);
+            c.set(Calendar.DATE,        ((dtime >> 16) & 0x1f));
+            c.set(Calendar.HOUR_OF_DAY, ((dtime >> 11) & 0x1f));
+            c.set(Calendar.MINUTE,      ((dtime >>  5) & 0x3f));
+            c.set(Calendar.SECOND,      ((dtime <<  1) & 0x3e));
+            c.set(Calendar.MILLISECOND, 0);
+            return c.getTimeInMillis();
         }
 
         void setNativeTime(int natTime) {

langtools/test/tools/javac/T6725036.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6725036
+ * @summary javac returns incorrect value for lastModifiedTime() when
+ *          source is a zip file archive
+ */
+
+import java.io.File;
+import java.util.Date;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import javax.tools.JavaFileObject;
+
+import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.file.ZipFileIndex;
+import com.sun.tools.javac.file.ZipFileIndexArchive;
+import com.sun.tools.javac.util.Context;
+
+public class T6725036 {
+    public static void main(String... args) throws Exception {
+        new T6725036().run();
+    }
+
+    void run() throws Exception {
+        String TEST_ENTRY_NAME = "java/lang/String.class";
+
+        File f = new File(System.getProperty("java.home"));
+        if (!f.getName().equals("jre"))
+            f = new File(f, "jre");
+        File rt_jar = new File(new File(f, "lib"), "rt.jar");
+
+        JarFile j = new JarFile(rt_jar);
+        JarEntry je = j.getJarEntry(TEST_ENTRY_NAME);
+        long jarEntryTime = je.getTime();
+
+        ZipFileIndex zfi =
+                ZipFileIndex.getZipFileIndex(rt_jar, null, false, null, false);
+        long zfiTime = zfi.getLastModified(TEST_ENTRY_NAME);
+
+        check(je, jarEntryTime, zfi + ":" + TEST_ENTRY_NAME, zfiTime);
+
+        Context context = new Context();
+        JavacFileManager fm = new JavacFileManager(context, false, null);
+        ZipFileIndexArchive zfia = new ZipFileIndexArchive(fm, zfi);
+        int sep = TEST_ENTRY_NAME.lastIndexOf("/");
+        JavaFileObject jfo =
+                zfia.getFileObject(TEST_ENTRY_NAME.substring(0, sep + 1),
+                    TEST_ENTRY_NAME.substring(sep + 1));
+        long jfoTime = jfo.getLastModified();
+
+        check(je, jarEntryTime, jfo, jfoTime);
+
+        if (errors > 0)
+            throw new Exception(errors + " occurred");
+    }
+
+    void check(Object ref, long refTime, Object test, long testTime) {
+        if (refTime == testTime)
+            return;
+        System.err.println("Error: ");
+        System.err.println("Expected: " + getText(ref, refTime));
+        System.err.println("   Found: " + getText(test, testTime));
+        errors++;
+    }
+
+    String getText(Object x, long t) {
+        return String.format("%14d", t) + " (" + new Date(t) + ") from " + x;
+    }
+
+    int errors;
+}