Skip to content

#19 catching Exception and rethrowing CancellationException #29

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.

Sign up for GitHub

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
Alex009 merged 1 commit into from
Jun 17, 2021
Merged

#19 catching Exception and rethrowing CancellationException #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion errors/src/commonMain/kotlin/dev/icerock/moko/errors/handler/ExceptionHandlerContextImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package dev.icerock.moko.errors.handler
import dev.icerock.moko.errors.ErrorEventListener
import dev.icerock.moko.errors.HandlerResult
import dev.icerock.moko.mvvm.dispatcher.EventsDispatcher
import kotlinx.coroutines.CancellationException
import kotlin.reflect.KClass

private typealias Catcher = (Throwable) -> Boolean
Expand Down Expand Up @@ -38,7 +39,9 @@ internal class ExceptionHandlerContextImpl<T : Any, R>(
override suspend fun execute(): HandlerResult<R, Throwable> {
return try {
HandlerResult.Success(block())
} catch (e: Throwable) {
} catch (e: Exception) {
// Don't handle coroutines CancellationException
if (e is CancellationException) throw e
onCatch?.invoke(e)
val isHandled = catchersMap[e::class]?.invoke(e)
if (isHandled == null || isHandled == false) {
Expand Down