Skip to content

Commit 6f98a9b

Browse files
committed
Fix reading environement variables
1 parent db9fb1f commit 6f98a9b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/main/java/org/radarbase/output/accounting/OffsetIntervals.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class OffsetIntervals {
7373

7474
fun add(range: OffsetRangeSet.Range) {
7575
val (from, to, lastModified) = range
76-
checkNotNull(to)
76+
checkNotNull(to) { "Cannot add OffsetRange if the `to` value is missing." }
7777
var index = offsetsFrom.binarySearch(from)
7878
if (index < 0) {
7979
// index where this range would be entered
@@ -143,7 +143,7 @@ class OffsetIntervals {
143143

144144
fun remove(range: OffsetRangeSet.Range) {
145145
val (from, to, _) = range
146-
checkNotNull(to)
146+
checkNotNull(to) { "Cannot add OffsetRange if the `to` value is missing." }
147147

148148
var index = offsetsFrom.binarySearch(from)
149149

src/main/java/org/radarbase/output/config/RestructureConfig.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ data class RestructureConfig(
8181
inline fun <T> T.copyEnv(key: String, doCopy: T.(String) -> T): T =
8282
copyOnChange<T, String?>(
8383
null,
84-
modification = { System.getenv(key).takeIf { it.isNotEmpty() } },
84+
modification = {
85+
System.getenv(key)
86+
?.takeIf { it.isNotEmpty() }
87+
},
8588
doCopy = { doCopy(requireNotNull(it) { "Environment variable $key is empty" }) },
8689
)
8790

0 commit comments

Comments
 (0)