commit cb7f37bdb6706635836578060c1bb8c960e921bf
author Vsevolod Tolstopyatov <qwwdfsad@gmail.com> Wed Jul 17 16:27:47 2019 +0300
committer Vsevolod Tolstopyatov <qwwdfsad@gmail.com> Thu Jul 18 12:01:43 2019 +0300
tree 921d3a7253c787f83e561468eacff083df06f72f
parent fe4186903547244e0fe5a46e4a51c461bdd51d36

Treat Duration.ZERO as 0L in jdk8 extensions

Fixes #1349

integration/kotlinx-coroutines-jdk8/src/time/Time.kt

diff --git a/integration/kotlinx-coroutines-jdk8/src/time/Time.kt b/integration/kotlinx-coroutines-jdk8/src/time/Time.kt
index f0d9415..031ac61 100644
--- a/integration/kotlinx-coroutines-jdk8/src/time/Time.kt
+++ b/integration/kotlinx-coroutines-jdk8/src/time/Time.kt
@@ -46,7 +46,7 @@
  *    - Non-suspending fast-paths (e.g. `withTimeout(1 nanosecond) { 42 }` should not throw)
  */
 private fun Duration.coerceToMillis(): Long {
-    if (isNegative) return 0
+    if (this <= Duration.ZERO) return 0
     if (this <= ChronoUnit.MILLIS.duration) return 1
 
     // Maximum scalar values of Duration.ofMillis(Long.MAX_VALUE)

integration/kotlinx-coroutines-jdk8/test/time/DurationOverflowTest.kt

diff --git a/integration/kotlinx-coroutines-jdk8/test/time/DurationOverflowTest.kt b/integration/kotlinx-coroutines-jdk8/test/time/DurationOverflowTest.kt
index a9b2752..9ab0ccf 100644
--- a/integration/kotlinx-coroutines-jdk8/test/time/DurationOverflowTest.kt
+++ b/integration/kotlinx-coroutines-jdk8/test/time/DurationOverflowTest.kt
@@ -65,4 +65,15 @@
         assertNull(result)
     }
 
+    @Test
+    fun testZeroDurationWithTimeout() = runTest {
+        assertFailsWith<TimeoutCancellationException> { withTimeout(0L) {} }
+        assertFailsWith<TimeoutCancellationException> { withTimeout(Duration.ZERO) {} }
+    }
+
+    @Test
+    fun testZeroDurationWithTimeoutOrNull() = runTest {
+        assertNull(withTimeoutOrNull(0L) {})
+        assertNull(withTimeoutOrNull(Duration.ZERO) {})
+    }
 }