diff options
| author | Michael Smith <msmith@spinnakernet.com> | 2002-03-23 16:12:03 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2002-03-23 16:12:03 +0000 |
| commit | 9817ad7792be3e68cd228cef2b538e78fef10396 (patch) | |
| tree | d45ba03dccc35a1110a4dd2a5d1175cbcb141136 | |
| parent | a641514dc5d3d89ce0de6825ace0200d6a3a058a (diff) | |
| download | gcc-9817ad7792be3e68cd228cef2b538e78fef10396.zip gcc-9817ad7792be3e68cd228cef2b538e78fef10396.tar.gz gcc-9817ad7792be3e68cd228cef2b538e78fef10396.tar.bz2 | |
re PR libgcj/6045 (GregorianCalendar: getMinimum() and getMaximum() incorrect for month)
2002-03-23 Michael Smith <msmith@spinnakernet.com>
* java/util/GregorianCalendar.java (minimums, maximums): Correct
MONTH entry. Fixes PR libgcj/6045.
From-SVN: r51232
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/GregorianCalendar.java | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 22dd097..52a9f3b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-03-23 Michael Smith <msmith@spinnakernet.com> + + * java/util/GregorianCalendar.java (minimums, maximums): Correct + MONTH entry. Fixes PR libgcj/6045. + 2002-03-23 Jeff Sturm <jsturm@one-point.com> * java/nat/natPlainSocketImpl.cc (write): Abort loop on error. diff --git a/libjava/java/util/GregorianCalendar.java b/libjava/java/util/GregorianCalendar.java index d019ec1..b01d971 100644 --- a/libjava/java/util/GregorianCalendar.java +++ b/libjava/java/util/GregorianCalendar.java @@ -1,5 +1,5 @@ /* java.util.GregorianCalendar - Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -917,11 +917,11 @@ public class GregorianCalendar extends Calendar } private static final int[] minimums = - { BC, 1, 1, 0, 1, 1, 1, SUNDAY, 1, + { BC, 1, 0, 0, 1, 1, 1, SUNDAY, 1, AM, 1, 0, 1, 1, 1, -(12*60*60*1000), 0 }; private static final int[] maximums = - { AD, 5000000, 12, 53, 5, 31, 366, SATURDAY, 5, + { AD, 5000000, 11, 53, 5, 31, 366, SATURDAY, 5, PM, 12, 23, 59, 59, 999, +(12*60*60*1000), (12*60*60*1000) }; /** |