Skip to content

Commit 3f25107

Browse files
authored
Merge pull request #520 from keynmol/special-case-Z-ZoneOffset
ZoneOffset.of("Z") must return UTC
2 parents f3b5cd0 + 8ed982f commit 3f25107

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ val scala3 = "3.3.3"
33
ThisBuild / scalaVersion := scala213
44
ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, scala3)
55

6-
ThisBuild / tlBaseVersion := "2.5"
6+
ThisBuild / tlBaseVersion := "2.6"
77

88
ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)
99

core/shared/src/main/scala/org/threeten/bp/ZoneOffset.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ object ZoneOffset {
103103
var _offsetId = offsetId
104104
Objects.requireNonNull(_offsetId, "offsetId")
105105

106-
// "Z" is always in the cache
106+
if (_offsetId == "Z")
107+
return ZoneOffset.UTC
108+
107109
val offset: ZoneOffset = ID_CACHE.get(_offsetId)
108110
if (offset != null)
109111
return offset

0 commit comments

Comments
 (0)