Skip to content

Fix TrampolineScheduler NullPointerException #1736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2014
Merged

Fix TrampolineScheduler NullPointerException #1736

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cf4349
Fix TrampolineScheduler NullPointerException
benjchristensen Oct 9, 2014
348ecce
Remove use of ThreadLocal
benjchristensen Oct 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/main/java/rx/schedulers/TrampolineScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,12 @@ public Worker createWorker() {
/* package accessible for unit tests */TrampolineScheduler() {
}

private static final ThreadLocal<PriorityQueue<TimedAction>> QUEUE = new ThreadLocal<PriorityQueue<TimedAction>>() {
@Override
protected PriorityQueue<TimedAction> initialValue() {
return new PriorityQueue<TimedAction>();
}
};

volatile int counter;
static final AtomicIntegerFieldUpdater<TrampolineScheduler> COUNTER_UPDATER = AtomicIntegerFieldUpdater.newUpdater(TrampolineScheduler.class, "counter");

private class InnerCurrentThreadScheduler extends Scheduler.Worker implements Subscription {

final PriorityQueue<TimedAction> queue = new PriorityQueue<TimedAction>();
private final BooleanSubscription innerSubscription = new BooleanSubscription();
private final AtomicInteger wip = new AtomicInteger();

Expand All @@ -76,13 +70,16 @@ private Subscription enqueue(Action0 action, long execTime) {
if (innerSubscription.isUnsubscribed()) {
return Subscriptions.empty();
}
PriorityQueue<TimedAction> queue = QUEUE.get();
final TimedAction timedAction = new TimedAction(action, execTime, COUNTER_UPDATER.incrementAndGet(TrampolineScheduler.this));
queue.add(timedAction);

if (wip.getAndIncrement() == 0) {
do {
queue.poll().action.call();
TimedAction polled = queue.poll();
// check for null as it could have been unsubscribed and removed
if (polled != null) {
polled.action.call();
}
} while (wip.decrementAndGet() > 0);
return Subscriptions.empty();
} else {
Expand All @@ -91,7 +88,7 @@ private Subscription enqueue(Action0 action, long execTime) {

@Override
public void call() {
PriorityQueue<TimedAction> _q = QUEUE.get();
PriorityQueue<TimedAction> _q = queue;
if (_q != null) {
_q.remove(timedAction);
}
Expand Down