diff options
| author | Mark Wielaard <mark@klomp.org> | 2004-06-27 13:03:53 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2004-06-27 13:03:53 +0000 |
| commit | df7c33d3e649116b9d279363e83a610481d6d113 (patch) | |
| tree | fb3683b938afb0029544fe2aac5ff36b93fb2c2d | |
| parent | 7decaca3465ea8cf8b073d8851f5d90fea5adc6f (diff) | |
| download | classpath-df7c33d3e649116b9d279363e83a610481d6d113.tar.gz | |
2004-06-27 Jerry Quinn <jlquinn@optonline.net>
* java/util/zip/ZipEntry.java (setTime): Remove scaling.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | java/util/zip/ZipEntry.java | 5 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2004-06-27 Jerry Quinn <jlquinn@optonline.net> + + * java/util/zip/ZipEntry.java (setTime): Remove scaling. + 2004-06-27 Andreas Tobler <a.tobler@schweiz.ch> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c diff --git a/java/util/zip/ZipEntry.java b/java/util/zip/ZipEntry.java index 3f7f64355..aa14bd27e 100644 --- a/java/util/zip/ZipEntry.java +++ b/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; } |