Call finalizer in one place in finalizeCase

arrow-kt · Nov 1, 2024 · 933607b · 933607b
1 parent 8e3eac6
commit 933607b
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Bracket.kt b/arrow-libs/fx/arrow-fx-coroutines/src/commonMain/kotlin/arrow/fx/coroutines/Bracket.kt
@@ -224,17 +224,14 @@ internal suspend inline fun runReleaseAndRethrow(original: Throwable?, crossinli
 
 @PublishedApi
 internal inline fun <R> finalizeCase(block: () -> R, finalizer: (ExitCase) -> Unit): R {
-  var finished = false
+  var exitCase: ExitCase = ExitCase.Completed
   return try {
     block()
   } catch (e: Throwable) {
-    finished = true
-    if (e !is CancellationException) e.nonFatalOrThrow()
-    finalizer(ExitCase.ExitCase(e))
+    exitCase = ExitCase.ExitCase(e)
     throw e
   } finally {
-    if (!finished) {
-      finalizer(ExitCase.Completed)
-    }
+    if (exitCase is ExitCase.Failure) exitCase.failure.nonFatalOrThrow()
+    finalizer(exitCase)
   }
 }