ensure waiting tasks are cancelled on worker unsubscription

ReactiveX · Apr 19, 2016 · 90f8287 · 90f8287
1 parent 6efc2cf
commit 90f8287
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/main/java/rx/schedulers/ExecutorScheduler.java b/src/main/java/rx/schedulers/ExecutorScheduler.java
@@ -96,18 +96,17 @@ public Subscription schedule(Action0 action) {
         @Override
         public void run() {
             do {
-                if (tasks.isUnsubscribed()) {
-                    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);
         }