Fix early return if CompletableDeferred is already completed

line · Jan 7, 2023 · a290434 · a290434
1 parent 2e094f4
commit a290434
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/...onal-kotlin/src/main/kotlin/com/linecorp/conditional/kotlin/ComposedCoroutineCondition.kt b/...onal-kotlin/src/main/kotlin/com/linecorp/conditional/kotlin/ComposedCoroutineCondition.kt
@@ -68,9 +68,7 @@ class ComposedCoroutineCondition internal constructor(
     private suspend fun completedAsync(ds: List<Deferred<Boolean>>) = coroutineScope {
         val deferred = CompletableDeferred<Boolean>()
         for (d in ds) {
-            if (d.isCompleted) {
-                break
-            }
+            if (deferred.isCompleted) break
             d.invokeOnCompletion { e ->
                 if (e != null) {
                     completeExceptionally(deferred, e)
@@ -81,11 +79,9 @@ class ComposedCoroutineCondition internal constructor(
                 }
             }
         }
-        if (!deferred.isCompleted) {
-            launch {
-                ds.awaitAll()
-                complete(deferred, false)
-            }
+        if (!deferred.isCompleted) launch {
+            ds.awaitAll()
+            complete(deferred, false)
         }
         deferred
     }