Release block on LazyStandaloneCoroutine start

Francesco Vasco · Francesco Vasco · commit 9304d60e6259 · 2018-10-29T11:26:22.000+01:00
diff --git a/common/kotlinx-coroutines-core-common/src/Builders.common.kt b/common/kotlinx-coroutines-core-common/src/Builders.common.kt
@@ -161,9 +161,13 @@ private open class StandaloneCoroutine(
 
 private class LazyStandaloneCoroutine(
     parentContext: CoroutineContext,
-    private val block: suspend CoroutineScope.() -> Unit
+    block: suspend CoroutineScope.() -> Unit
 ) : StandaloneCoroutine(parentContext, active = false) {
+    private var block: (suspend CoroutineScope.() -> Unit)? = block
+
     override fun onStart() {
+        val block = checkNotNull(this.block) { "Already started" }
+        this.block = null
         block.startCoroutineCancellable(this, this)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -161,9 +161,13 @@ private open class StandaloneCoroutine(`
`161`	`161`
`162`	`162`	`private class LazyStandaloneCoroutine(`
`163`	`163`	`parentContext: CoroutineContext,`
`164`		`- private val block: suspend CoroutineScope.() -> Unit`
	`164`	`+ block: suspend CoroutineScope.() -> Unit`
`165`	`165`	`) : StandaloneCoroutine(parentContext, active = false) {`
	`166`	`+ private var block: (suspend CoroutineScope.() -> Unit)? = block`
	`167`	`+`
`166`	`168`	`override fun onStart() {`
	`169`	`+ val block = checkNotNull(this.block) { "Already started" }`
	`170`	`+ this.block = null`
`167`	`171`	`block.startCoroutineCancellable(this, this)`
`168`	`172`	`}`
`169`	`173`	`}`