Merge branch 'develop' of github.com:Kotlin/kotlinx.coroutines into segment-list

ndkoval · ndkoval · commit 8646c8ce23da · 2019-09-27T13:15:26.000+03:00
diff --git a/kotlinx-coroutines-core/common/src/channels/AbstractChannel.kt b/kotlinx-coroutines-core/common/src/channels/AbstractChannel.kt
@@ -1051,7 +1051,7 @@ internal class SendElement(
 ) : Send() {
     override fun tryResumeSend(otherOp: PrepareOp?): Symbol? {
         otherOp?.finishPrepare()
-        val token = cont.tryResume(Unit, otherOp?.desc)
+        val token = cont.tryResume(Unit, otherOp?.desc) ?: return null
         assert { token === RESUME_TOKEN } // the only other possible result
         return RESUME_TOKEN
     }

Original file line number	Diff line number	Diff line change
`@@ -1051,7 +1051,7 @@ internal class SendElement(`
`1051`	`1051`	`) : Send() {`
`1052`	`1052`	`override fun tryResumeSend(otherOp: PrepareOp?): Symbol? {`
`1053`	`1053`	`otherOp?.finishPrepare()`
`1054`		`- val token = cont.tryResume(Unit, otherOp?.desc)`
	`1054`	`+ val token = cont.tryResume(Unit, otherOp?.desc) ?: return null`
`1055`	`1055`	`assert { token === RESUME_TOKEN } // the only other possible result`
`1056`	`1056`	`return RESUME_TOKEN`
`1057`	`1057`	`}`