Skip to content

Fix missing unbox state in native runBlocking #2091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kotlinx-coroutines-core/native/src/Builders.kt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private class BlockingCoroutine<T>(
eventLoop?.decrementUseCount()
}
// now return result
val state = state
val state = state.unboxState()
(state as? CompletedExceptionally)?.let { throw it.cause }
state as T
}
Expand Down
18 changes: 18 additions & 0 deletions kotlinx-coroutines-core/native/test/RunBlockingTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
*/

package kotlinx.coroutines
import kotlin.test.*

class RunBlockingTest : TestBase() {

@Test
fun testIncompleteState() {
val handle = runBlocking {
coroutineContext[Job]!!.invokeOnCompletion { }
}

handle.dispose()
}
}