diff options
| author | glewis <glewis@FreeBSD.org> | 2006-11-06 19:51:16 +0000 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2006-11-06 19:51:16 +0000 |
| commit | 7c31df71ade5b92a08f0e7e56369151d337b25a5 (patch) | |
| tree | 23f87e5600f03524dfdcc48ce41832b888f15693 /java | |
| parent | 7c3f9900d34d491f760f2ed4ecd539ce7eb21715 (diff) | |
| download | FreeBSD-ports-7c31df71ade5b92a08f0e7e56369151d337b25a5.zip FreeBSD-ports-7c31df71ade5b92a08f0e7e56369151d337b25a5.tar.gz | |
. Fix a possible problem building the JDK in the GMT+0 time zone. When
building, the JDK zone info file doesn't exist yet, so attempting to
get the zone info for GMT_ID would fail.
Submitted by: Kurt Miller <kurt@intricatesoftware.com>
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk15/files/patch-j2se::util::TimeZone.java | 21 | ||||
| -rw-r--r-- | java/jdk16/files/patch-j2se::util::TimeZone.java | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/java/jdk15/files/patch-j2se::util::TimeZone.java b/java/jdk15/files/patch-j2se::util::TimeZone.java new file mode 100644 index 0000000..834897b --- /dev/null +++ b/java/jdk15/files/patch-j2se::util::TimeZone.java @@ -0,0 +1,21 @@ +$FreeBSD$ + +--- ../../j2se/src/share/classes/java/util/TimeZone.java 8 Nov 2004 22:27:20 -0000 1.1.1.1 ++++ ../../j2se/src/share/classes/java/util/TimeZone.java 5 Nov 2006 17:43:12 -0000 +@@ -748,15 +748,13 @@ + } + int gmtOffset = (hours * 60 + num) * 60 * 1000; + ++ zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset); + if (gmtOffset == 0) { +- zi = ZoneInfoFile.getZoneInfo(GMT_ID); + if (negative) { + zi.setID("GMT-00:00"); + } else { + zi.setID("GMT+00:00"); + } +- } else { +- zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset); + } + return zi; + } diff --git a/java/jdk16/files/patch-j2se::util::TimeZone.java b/java/jdk16/files/patch-j2se::util::TimeZone.java new file mode 100644 index 0000000..834897b --- /dev/null +++ b/java/jdk16/files/patch-j2se::util::TimeZone.java @@ -0,0 +1,21 @@ +$FreeBSD$ + +--- ../../j2se/src/share/classes/java/util/TimeZone.java 8 Nov 2004 22:27:20 -0000 1.1.1.1 ++++ ../../j2se/src/share/classes/java/util/TimeZone.java 5 Nov 2006 17:43:12 -0000 +@@ -748,15 +748,13 @@ + } + int gmtOffset = (hours * 60 + num) * 60 * 1000; + ++ zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset); + if (gmtOffset == 0) { +- zi = ZoneInfoFile.getZoneInfo(GMT_ID); + if (negative) { + zi.setID("GMT-00:00"); + } else { + zi.setID("GMT+00:00"); + } +- } else { +- zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset); + } + return zi; + } |
