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

8177819: DateTimeFormatterBuilder zone parsing should recognise DST

Browse source 
8277049: ZonedDateTime parse in Fall DST transition fails to retain the correct zonename.

Reviewed-by: joehw, scolebourne
This commit is contained in:
Naoto Sato 2021-12-01 17:14:53 +00:00
parent 9b3e672059
commit a363b7b921
5 changed files with 121 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/java.base/share/classes/java/time/format/Parsed.java
View file

@ -87,6 +87,7 @@ import java.time.LocalTime;
import java.time.Period;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.chrono.ChronoLocalDate;
import java.time.chrono.ChronoLocalDateTime;
import java.time.chrono.ChronoZonedDateTime;
@ -132,6 +133,10 @@ final class Parsed implements TemporalAccessor {
* The parsed zone.
*/
ZoneId zone;
/**
* The parsed zone name type.
*/
int zoneNameType = DateTimeFormatterBuilder.ZoneTextPrinterParser.UNDEFINED;
/**
* The parsed chronology.
*/
@ -175,6 +180,7 @@ final class Parsed implements TemporalAccessor {
Parsed cloned = new Parsed();
cloned.fieldValues.putAll(this.fieldValues);
cloned.zone = this.zone;
cloned.zoneNameType = this.zoneNameType;
cloned.chrono = this.chrono;
cloned.leapSecond = this.leapSecond;
cloned.dayPeriod = this.dayPeriod;
@ -652,8 +658,12 @@ final class Parsed implements TemporalAccessor {
fieldValues.put(INSTANT_SECONDS, instant);
} else {
if (zone != null) {
long instant = date.atTime(time).atZone(zone).toEpochSecond();
fieldValues.put(INSTANT_SECONDS, instant);
var czdt = date.atTime(time).atZone(zone);
if (zoneNameType == DateTimeFormatterBuilder.ZoneTextPrinterParser.STD ||
zoneNameType == DateTimeFormatterBuilder.ZoneTextPrinterParser.GENERIC) {
czdt = czdt.withLaterOffsetAtOverlap();
}
fieldValues.put(INSTANT_SECONDS, czdt.toEpochSecond());
}
}
}
@ -718,6 +728,7 @@ final class Parsed implements TemporalAccessor {
buf.append(fieldValues).append(',').append(chrono);
if (zone != null) {
buf.append(',').append(zone);
buf.append(',').append(zoneNameType);
}
if (date != null || time != null) {
buf.append(" resolved to ");