mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 00:30:33 -04:00
f970203bc1
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>
21 lines
625 B
Java
21 lines
625 B
Java
$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;
|
|
}
|