ensure waiting tasks are cancelled on worker unsubscription (#3867)

ReactiveX · Apr 20, 2016 · 3439dd8 · 3439dd8
1 parent 8af2bc9
commit 3439dd8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/rx/schedulers/ExecutorScheduler.java b/src/main/java/rx/schedulers/ExecutorScheduler.java
@@ -100,14 +100,17 @@ public void run() {
                     queue.clear();
                     return;
                 }
-
                 ScheduledAction sa = queue.poll();
                 if (sa == null) {
                     return;
                 }
-
                 if (!sa.isUnsubscribed()) {
-                    sa.run();
+                    if (!tasks.isUnsubscribed()) {
+                        sa.run();
+                    } else {
+                        queue.clear();
+                        return;
+                    }
                 }
             } while (wip.decrementAndGet() != 0);
         }