From 8961d736777928a349fc93e95d5bcdb2c44adec5 Mon Sep 17 00:00:00 2001
From: metabrix <admin@epserv.ru>
Date: Mon, 22 Jul 2024 21:24:28 +0500
Subject: [PATCH] fix(kotlin-extensions): NPE in
 CloudKeyContainer.getOrNull(...) (#754)

---
 .../incendo/cloud/kotlin/extension/CloudKeyExtensions.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cloud-kotlin/cloud-kotlin-extensions/src/main/kotlin/org/incendo/cloud/kotlin/extension/CloudKeyExtensions.kt b/cloud-kotlin/cloud-kotlin-extensions/src/main/kotlin/org/incendo/cloud/kotlin/extension/CloudKeyExtensions.kt
index ef0f5a882..a3a60d91f 100644
--- a/cloud-kotlin/cloud-kotlin-extensions/src/main/kotlin/org/incendo/cloud/kotlin/extension/CloudKeyExtensions.kt
+++ b/cloud-kotlin/cloud-kotlin-extensions/src/main/kotlin/org/incendo/cloud/kotlin/extension/CloudKeyExtensions.kt
@@ -35,7 +35,7 @@ import org.incendo.cloud.key.CloudKeyHolder
  * @return the value, or `null`
  */
 public fun <T : Any> CloudKeyContainer.getOrNull(key: CloudKey<T>): T? =
-    this.optional(key).orElseGet(null)
+    this.optional(key).orElse(null)
 
 /**
  * Returns the value associated with the given [key], if it exists.
@@ -45,7 +45,7 @@ public fun <T : Any> CloudKeyContainer.getOrNull(key: CloudKey<T>): T? =
  * @return the value, or `null`
  */
 public fun <T : Any> CloudKeyContainer.getOrNull(key: String): T? =
-    this.optional<T>(key).orElseGet(null)
+    this.optional<T>(key).orElse(null)
 
 /**
  * Returns the value associated with the given [keyHolder], if it exists.
@@ -55,7 +55,7 @@ public fun <T : Any> CloudKeyContainer.getOrNull(key: String): T? =
  * @return the value, or `null`
  */
 public fun <T : Any> CloudKeyContainer.getOrNull(keyHolder: CloudKeyHolder<T>): T? =
-    this.optional<T>(keyHolder).orElseGet(null)
+    this.optional<T>(keyHolder).orElse(null)
 
 /**
  * Creates a new key with the given [name].