summaryrefslogtreecommitdiffstats
path: root/libjava/java/util
diff options
context:
space:
mode:
authorjlquinn <jlquinn@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-06 20:52:10 +0000
committerjlquinn <jlquinn@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-06 20:52:10 +0000
commitc6eea4f68b3c10efa570552b1e581bc3bc474ecf (patch)
tree03b2b302e0d2a0d94ee536bafe29541e9e918bee /libjava/java/util
parentd6cea54f8591fea7260c5b6472333e545cdfdd82 (diff)
downloadppe42-gcc-c6eea4f68b3c10efa570552b1e581bc3bc474ecf.tar.gz
ppe42-gcc-c6eea4f68b3c10efa570552b1e581bc3bc474ecf.zip
2004-06-06 Jerry Quinn <jlquinn@optonline.net>
* java/util/zip/ZipEntry.java (setTime): Remove scaling. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82674 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util')
-rw-r--r--libjava/java/util/zip/ZipEntry.java5
1 files changed, 2 insertions, 3 deletions
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;
}
OpenPOWER on IntegriCloud