Throw TimeoutCancellationException instead of CancellationException o…

…n negative timeout in withTimeout Fixes #870
Kotlin · Dec 6, 2018 · 3c4168b · 3c4168b
1 parent a5b6a33
commit 3c4168b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/common/kotlinx-coroutines-core-common/src/Timeout.kt b/common/kotlinx-coroutines-core-common/src/Timeout.kt
@@ -25,7 +25,7 @@ import kotlin.jvm.*
  * @param timeMillis timeout time in milliseconds.
  */
 public suspend fun <T> withTimeout(timeMillis: Long, block: suspend CoroutineScope.() -> T): T {
- if (timeMillis <= 0L) throw CancellationException("Timed out immediately")
+ if (timeMillis <= 0L) throw TimeoutCancellationException("Timed out immediately")
  return suspendCoroutineUninterceptedOrReturn { uCont ->
  setupTimeout(TimeoutCoroutine(timeMillis, uCont), block)
  }

diff --git a/common/kotlinx-coroutines-core-common/test/WithTimeoutTest.kt b/common/kotlinx-coroutines-core-common/test/WithTimeoutTest.kt
@@ -175,7 +175,7 @@ class WithTimeoutTest : TestBase() {
  expectUnreached()
  "OK"
  }
- } catch (e: CancellationException) {
+ } catch (e: TimeoutCancellationException) {
  assertEquals("Timed out immediately", e.message)
  finish(2)
  }