archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8285844: TimeZone.getTimeZone(ZoneOffset) does not work for all ZoneOffsets and returns GMT unexpected

Browse source 
Reviewed-by: uschindler, scolebourne, joehw
This commit is contained in:
Naoto Sato 2022-05-16 15:45:01 +00:00
parent dbd3737085
commit b884db8f7c
4 changed files with 155 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
View file

@ -178,15 +178,16 @@ public final class ZoneInfoFile {
public static String toCustomID(int gmtOffset) {
char sign;
int offset = gmtOffset / 60000;
int offset = gmtOffset / 1_000;
if (offset >= 0) {
sign = '+';
} else {
sign = '-';
offset = -offset;
}
int hh = offset / 60;
int mm = offset % 60;
int hh = offset / 3_600;
int mm = (offset % 3_600) / 60;
int ss = offset % 60;
char[] buf = new char[] { 'G', 'M', 'T', sign, '0', '0', ':', '0', '0' };
if (hh >= 10) {
@ -197,7 +198,13 @@ public final class ZoneInfoFile {
buf[7] += (char)(mm / 10);
buf[8] += (char)(mm % 10);
}
return new String(buf);
var id = new String(buf);
if (ss != 0) {
buf[7] = (char)('0' + ss / 10);
buf[8] = (char)('0' + ss % 10);
id += new String(buf, 6, 3);
}
return id;
}
///////////////////////////////////////////////////////////