From 648b6075b27f942672d0665619acf58747768fd4 Mon Sep 17 00:00:00 2001 From: Jerry Quinn Date: Sun, 6 Jun 2004 20:52:10 +0000 Subject: [PATCH] ZipEntry.java (setTime): Remove scaling. 2004-06-06 Jerry Quinn * java/util/zip/ZipEntry.java (setTime): Remove scaling. From-SVN: r82674 --- libjava/ChangeLog | 4 ++++ libjava/java/util/zip/ZipEntry.java | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 38c41b6d91b..091a2dc50a1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2004-06-06 Jerry Quinn + + * java/util/zip/ZipEntry.java (setTime): Remove scaling. + 2004-06-05 Michael Koch * javax/swing/SwingConstants.java diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java index 3f7f6435529..aa14bd27e09 100644 --- 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; } -- 2.30.2