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

8285838: DST not applying properly with zone id offset set with TZ env variable

Browse source 
Reviewed-by: naoto
This commit is contained in:
Gaurav Chaudhari 2022-06-13 20:01:57 +00:00 • committed by Naoto Sato
parent 53a0acee06
commit 9b6d0a7e94
2 changed files with 94 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/java.base/unix/native/libjava/TimeZone_md.c
View file

@ -592,18 +592,31 @@ getGMTOffsetID()
{
time_t offset;
char sign, buf[32];
offset = timezone;
struct tm localtm;
time_t clock;
clock = time(NULL);
if (localtime_r(&clock, &localtm) == NULL) {
return strdup("GMT");
}
struct tm gmt;
if (gmtime_r(&clock, &gmt) == NULL) {
return strdup("GMT");
}
offset = (localtm.tm_hour - gmt.tm_hour)*3600 + (localtm.tm_min - gmt.tm_min)*60;
if (offset == 0) {
return strdup("GMT");
}
/* Note that the time offset direction is opposite. */
if (offset > 0) {
sign = '-';
sign = '+';
} else {
offset = -offset;
sign = '+';
sign = '-';
}
sprintf(buf, (const char *)"GMT%c%02d:%02d",
sign, (int)(offset/3600), (int)((offset%3600)/60));