test/tools/javac/T6725036.java

@@ -28,10 +28,11 @@
  *          source is a zip file archive
  */
 
 import java.io.File;
 import java.util.Date;
+import java.util.TimeZone;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.file.JavacFileManager;

@@ -60,21 +61,23 @@
 
         ZipFileIndexCache zfic = ZipFileIndexCache.getSharedInstance();
         ZipFileIndex zfi = zfic.getZipFileIndex(rt_jar, null, false, null, false);
         long zfiTime = zfi.getLastModified(TEST_ENTRY_NAME);
 
-        check(je, jarEntryTime, zfi + ":" + TEST_ENTRY_NAME.getPath(), zfiTime);
+        check(je, jarEntryTime - TimeZone.getDefault().getOffset(jarEntryTime), 
+              zfi + ":" + TEST_ENTRY_NAME.getPath(), zfiTime);
 
         Context context = new Context();
         JavacFileManager fm = new JavacFileManager(context, false, null);
         ZipFileIndexArchive zfia = new ZipFileIndexArchive(fm, zfi);
         JavaFileObject jfo =
             zfia.getFileObject(TEST_ENTRY_NAME.dirname(),
                                    TEST_ENTRY_NAME.basename());
         long jfoTime = jfo.getLastModified();
 
-        check(je, jarEntryTime, jfo, jfoTime);
+        check(je, jarEntryTime - TimeZone.getDefault().getOffset(jarEntryTime),
+              jfo, jfoTime);
 
         if (errors > 0)
             throw new Exception(errors + " occurred");
     }