Merge with cancellation rework

qwwdfsad · qwwdfsad · commit 4651b57c4be3 · 2019-03-13T15:06:31.000+03:00
diff --git a/kotlinx-coroutines-core/common/src/Dispatched.kt b/kotlinx-coroutines-core/common/src/Dispatched.kt
@@ -270,7 +270,7 @@ internal abstract class DispatchedTask<in T>(
         val cause = exception ?: finallyException
         val reason = CoroutinesInternalError("Fatal exception in coroutines machinery for $this. " +
                 "Please read KDoc to 'handleFatalException' method and report this incident to maintainers", cause!!)
-        handleExceptionViaHandler(this.delegate.context, reason)
+        handleCoroutineException(this.delegate.context, reason)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ internal abstract class DispatchedTask<in T>(`
`270`	`270`	`val cause = exception ?: finallyException`
`271`	`271`	`val reason = CoroutinesInternalError("Fatal exception in coroutines machinery for $this. " +`
`272`	`272`	`"Please read KDoc to 'handleFatalException' method and report this incident to maintainers", cause!!)`
`273`		`- handleExceptionViaHandler(this.delegate.context, reason)`
	`273`	`+ handleCoroutineException(this.delegate.context, reason)`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`