Fail more gracefully if the tzdb failed to initialize

Now, not everything will break, but only the calls to timezone facilities.
Kotlin · Feb 21, 2024 · 07d3270 · 07d3270
1 parent 38650e6
commit 07d3270
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/core/darwin/src/internal/TimeZoneNative.kt b/core/darwin/src/internal/TimeZoneNative.kt
@@ -10,7 +10,9 @@ import kotlinx.cinterop.*
 import kotlinx.datetime.internal.*
 import platform.Foundation.*
 
-internal actual val systemTzdb: TimeZoneDatabase = TzdbOnFilesystem(Path.fromString(defaultTzdbPath()))
+internal actual val systemTzdb: TimeZoneDatabase get() = tzdb.getOrThrow()
+
+private val tzdb = runCatching { TzdbOnFilesystem(Path.fromString(defaultTzdbPath())) }
 
 internal expect fun defaultTzdbPath(): String
 

diff --git a/core/linux/src/internal/TimeZoneNative.kt b/core/linux/src/internal/TimeZoneNative.kt
@@ -5,7 +5,9 @@
 
 package kotlinx.datetime.internal
 
-internal actual val systemTzdb: TimeZoneDatabase = TzdbOnFilesystem()
+internal actual val systemTzdb: TimeZoneDatabase get() = tzdb.getOrThrow()
+
+private val tzdb = runCatching { TzdbOnFilesystem() }
 
 internal actual fun currentSystemDefaultZone(): Pair<String, TimeZoneRules?> {
     val zoneId = pathToSystemDefault()?.second?.toString()

diff --git a/core/windows/src/internal/TimeZoneNative.kt b/core/windows/src/internal/TimeZoneNative.kt
@@ -5,8 +5,9 @@
 
 package kotlinx.datetime.internal
 
-internal actual val systemTzdb: TimeZoneDatabase get() = tzdbInRegistry
+internal actual val systemTzdb: TimeZoneDatabase get() = tzdbInRegistry.getOrThrow()
 
-internal actual fun currentSystemDefaultZone(): Pair<String, TimeZoneRules?> = tzdbInRegistry.currentSystemDefault()
+internal actual fun currentSystemDefaultZone(): Pair<String, TimeZoneRules?> =
+    tzdbInRegistry.getOrThrow().currentSystemDefault()
 
-private val tzdbInRegistry = TzdbInRegistry()
+private val tzdbInRegistry = runCatching { TzdbInRegistry() }