ZipEntry.java (setTime): Remove scaling.

2004-06-06  Jerry Quinn  <jlquinn@optonline.net>

	* java/util/zip/ZipEntry.java (setTime): Remove scaling.

From-SVN: r82674

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 38c41b6d91bb06ecc7fa2fc25dfa3b87a4cd9b68..091a2dc50a18bda0921611a9f22fe631b3d7af36 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-06  Jerry Quinn  <jlquinn@optonline.net>
+
+       * java/util/zip/ZipEntry.java (setTime): Remove scaling.
+
 2004-06-05  Michael Koch  <konqueror@gmx.de>
 
        * javax/swing/SwingConstants.java

diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java
index 3f7f643552944ff3a3696755ca002146be4eab1f..aa14bd27e09bc28d675f7658a153665efdc8aafb 100644 (file)
--- a/libjava/java/util/zip/ZipEntry.java
+++ b/libjava/java/util/zip/ZipEntry.java
@@ -1,5 +1,5 @@
 /* java.util.zip.ZipEntry
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -168,7 +168,7 @@ public class ZipEntry implements ZipConstants, Cloneable
     Calendar cal = getCalendar();
     synchronized (cal)
       {
-       cal.setTime(new Date(time*1000L));
+       cal.setTime(new Date(time));
        dostime = (cal.get(Calendar.YEAR) - 1980 & 0x7f) << 25
          | (cal.get(Calendar.MONTH) + 1) << 21
          | (cal.get(Calendar.DAY_OF_MONTH)) << 16
@@ -176,7 +176,6 @@ public class ZipEntry implements ZipConstants, Cloneable
          | (cal.get(Calendar.MINUTE)) << 5
          | (cal.get(Calendar.SECOND)) >> 1;
       }
-    dostime = (int) (dostime / 1000L);
     this.known |= KNOWN_TIME;
   }