/hg/release/icedtea6-1.6: PR377. SimpleTimeZone checks too stric...

[mjw at icedtea.classpath.org]

changeset 3013950f3909 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=3013950f3909
author: Mark Wielaard <mark at klomp.org>
date: Sun Aug 30 17:58:20 2009 +0200

	PR377. SimpleTimeZone checks too strict for Asia/Amman TimeZone.

	 *
	overlays/openjdk/jdk/test/java/util/SimpleTimeZone/EndOfDay.java:
	New test.
		* patches/icedtea-simpletimezone-relax.patch: New patch.
		* Makefile.am: Add new patch.
		* HACKING: Describe new patch.


diffstat:

5 files changed, 56 insertions(+)
ChangeLog                                                        |    9 +++
HACKING                                                          |    2 
Makefile.am                                                      |    1 
overlays/openjdk/jdk/test/java/util/SimpleTimeZone/EndOfDay.java |   23 ++++++++++
patches/icedtea-simpletimezone-relax.patch                       |   21 +++++++++

diffs (91 lines):

diff -r b3106a2e4455 -r 3013950f3909 ChangeLog
--- a/ChangeLog	Mon Aug 31 07:45:07 2009 +0200
+++ b/ChangeLog	Sun Aug 30 17:58:20 2009 +0200
@@ -1,3 +1,12 @@ 2009-08-31  Mark Wielaard  <mjw at redhat.c
+2009-08-30  Mark Wielaard  <mark at klomp.org>
+
+	PR377. SimpleTimeZone checks too strict for Asia/Amman TimeZone.
+	* overlays/openjdk/jdk/test/java/util/SimpleTimeZone/EndOfDay.java:
+	New test.
+	* patches/icedtea-simpletimezone-relax.patch: New patch.
+	* Makefile.am: Add new patch.
+	* HACKING: Describe new patch.
+
 2009-08-31  Mark Wielaard  <mjw at redhat.com>
 	    Keith Seitz  <keiths at redhat.com>
 
diff -r b3106a2e4455 -r 3013950f3909 HACKING
--- a/HACKING	Mon Aug 31 07:45:07 2009 +0200
+++ b/HACKING	Sun Aug 30 17:58:20 2009 +0200
@@ -116,6 +116,8 @@ The following patches are only applied t
 * icedtea-6712835-ifnode.patch: Fix infinite loop in PhaseIterGVN::transform.
 * icedtea-timezone.patch : Makes java only look for time zone information in
   /etc/sysconfig/clock if /etc/localtime is not found (fix for rh-489586)
+* icedtea-simpletimezone-relax.patch: Fix for PR377, Jordan end of day rule
+  in Asia/Amman TimeZone. SimpleTimeZone checks too strict.
 * icedtea-timezone-default-permission.patch: Partial fix for PR381
   (in combination with icedtea-use-system-tzdata.patch) security check
   debug printing overflow. Also in openjdk7 b22, but apparently lost
diff -r b3106a2e4455 -r 3013950f3909 Makefile.am
--- a/Makefile.am	Mon Aug 31 07:45:07 2009 +0200
+++ b/Makefile.am	Sun Aug 30 17:58:20 2009 +0200
@@ -537,6 +537,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-tools.patch \
 	patches/icedtea-timezone.patch \
 	patches/icedtea-timezone-default-permission.patch \
+	patches/icedtea-simpletimezone-relax.patch \
 	patches/icedtea-use-system-tzdata.patch \
 	patches/icedtea-headers.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-headers.patch \
diff -r b3106a2e4455 -r 3013950f3909 overlays/openjdk/jdk/test/java/util/SimpleTimeZone/EndOfDay.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/test/java/util/SimpleTimeZone/EndOfDay.java	Sun Aug 30 17:58:20 2009 +0200
@@ -0,0 +1,23 @@
+/*
+ * @test
+ * @bug 0000377
+ * @summary SimpleTimeZone should accept start/end rules at end of day
+ */
+
+import java.util.Calendar;
+import java.util.SimpleTimeZone;
+
+public class EndOfDay
+{
+  public static void main(String[] args)
+  {
+    SimpleTimeZone stz;
+    stz = new SimpleTimeZone(0, "End/Day",
+			     Calendar.MARCH, -1, Calendar.FRIDAY,
+			     24 * 60 * 60 * 1000,
+			     Calendar.APRIL, 1, Calendar.THURSDAY,
+			     24 * 60 * 60 * 1000,
+			     3600000);
+    System.err.println(stz);
+  }
+}
diff -r b3106a2e4455 -r 3013950f3909 patches/icedtea-simpletimezone-relax.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-simpletimezone-relax.patch	Sun Aug 30 17:58:20 2009 +0200
@@ -0,0 +1,21 @@
+diff -r 348fce38de3f src/share/classes/java/util/SimpleTimeZone.java
+--- openjdk/jdk/src/share/classes/java/util/SimpleTimeZone.java	Fri Jun 26 19:50:44 2009 +0400
++++ openjdk/jdk/src/share/classes/java/util/SimpleTimeZone.java	Sat Aug 29 22:36:41 2009 +0200
+@@ -1372,7 +1372,7 @@
+                 throw new IllegalArgumentException(
+                         "Illegal start month " + startMonth);
+             }
+-            if (startTime < 0 || startTime >= millisPerDay) {
++            if (startTime < 0 || startTime > millisPerDay) {
+                 throw new IllegalArgumentException(
+                         "Illegal start time " + startTime);
+             }
+@@ -1419,7 +1419,7 @@
+                 throw new IllegalArgumentException(
+                         "Illegal end month " + endMonth);
+             }
+-            if (endTime < 0 || endTime >= millisPerDay) {
++            if (endTime < 0 || endTime > millisPerDay) {
+                 throw new IllegalArgumentException(
+                         "Illegal end time " + endTime);
+             }