Refactored/improved while loop inside AtomicExecutor

ably · Oct 17, 2024 · 6009d6c · 6009d6c
1 parent 0596e88
commit 6009d6c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/chat-android/src/main/java/com/ably/chat/AtomicExecutor.kt b/chat-android/src/main/java/com/ably/chat/AtomicExecutor.kt
@@ -33,10 +33,12 @@ class AtomicExecutor(private val scope: CoroutineScope) {
         scope.launch {
             if (!isRunning) {
                 isRunning = true
-                while (priorityQueue.size > 0) {
-                    val task = priorityQueue.remove()
-                    val result = kotlin.runCatching { scope.async(block = task.coroutineBlock).await() }
-                    task.resultChannel.send(result)
+                while (priorityQueue.isNotEmpty()) {
+                    val task = priorityQueue.poll()
+                    task?.let {
+                        val result = kotlin.runCatching { scope.async(block = it.coroutineBlock).await() }
+                        it.resultChannel.send(result)
+                    }
                 }
                 isRunning = false
             }