Fix logic that determines future removal for scheduled executors (#1995)

I've failed to write a reliable test here. See also #571 Fixes #1992
Kotlin · May 7, 2020 · 5ecebe1 · 5ecebe1
1 parent 18f68ad
commit 5ecebe1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/kotlinx-coroutines-core/jvm/src/internal/Concurrent.kt b/kotlinx-coroutines-core/jvm/src/internal/Concurrent.kt
@@ -29,10 +29,10 @@ private val REMOVE_FUTURE_ON_CANCEL: Method? = try {
 @Suppress("NAME_SHADOWING")
 internal fun removeFutureOnCancel(executor: Executor): Boolean {
     try {
-        val executor = executor as? ScheduledExecutorService ?: return false
+        val executor = executor as? ScheduledThreadPoolExecutor ?: return false
         (REMOVE_FUTURE_ON_CANCEL ?: return false).invoke(executor, true)
         return true
     } catch (e: Throwable) {
-        return true
+        return false // failed to setRemoveOnCancelPolicy, assume it does not removes future on cancel
     }
 }