Skip to content
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

2.x: cancel upstream first, dispose worker last #5075

Merged
merged 2 commits into from
Feb 6, 2017
Merged

2.x: cancel upstream first, dispose worker last #5075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0db1d53
2.x: cancel upstream first, dispose worker last
akarnokd Feb 6, 2017
d0ffd35
Merge branch '2.x' into WorkerDisposeLater
akarnokd Feb 6, 2017
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
14 changes: 7 additions & 7 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableBufferTimed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ public void request(long n) {

@Override
public void cancel() {
DisposableHelper.dispose(timer);

s.cancel();

DisposableHelper.dispose(timer);
}

@Override
Expand Down Expand Up @@ -333,9 +333,9 @@ public void request(long n) {

@Override
public void cancel() {
w.dispose();
clear();
s.cancel();
w.dispose();
}

void clear() {
Expand Down Expand Up @@ -497,17 +497,15 @@ public void onNext(T t) {

@Override
public void onError(Throwable t) {
w.dispose();
synchronized (this) {
buffer = null;
}
actual.onError(t);
w.dispose();
}

@Override
public void onComplete() {
w.dispose();

U b;
synchronized (this) {
b = buffer;
Expand All @@ -519,6 +517,8 @@ public void onComplete() {
if (enter()) {
QueueDrainHelper.drainMaxLoop(queue, actual, false, this, this);
}

w.dispose();
}

@Override
Expand All @@ -543,11 +543,11 @@ public void cancel() {

@Override
public void dispose() {
w.dispose();
synchronized (this) {
buffer = null;
}
s.cancel();
w.dispose();
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableDebounceTimed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ public void onError(Throwable t) {
return;
}
done = true;
DisposableHelper.dispose(timer);
actual.onError(t);
worker.dispose();
}

@Override
Expand All @@ -127,8 +127,8 @@ public void onComplete() {
de.emit();
}
DisposableHelper.dispose(timer);
worker.dispose();
actual.onComplete();
worker.dispose();
}
}

Expand All @@ -141,9 +141,8 @@ public void request(long n) {

@Override
public void cancel() {
DisposableHelper.dispose(timer);
worker.dispose();
s.cancel();
worker.dispose();
}

void emit(long idx, T t, DebounceEmitter<T> emitter) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/reactivex/internal/operators/flowable/FlowableDelay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ public void request(long n) {

@Override
public void cancel() {
w.dispose();
s.cancel();
w.dispose();
}

}
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableThrottleFirstTimed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ public void onError(Throwable t) {
return;
}
done = true;
DisposableHelper.dispose(timer);
actual.onError(t);
worker.dispose();
}

@Override
Expand All @@ -133,9 +133,8 @@ public void onComplete() {
return;
}
done = true;
DisposableHelper.dispose(timer);
worker.dispose();
actual.onComplete();
worker.dispose();
}

@Override
Expand All @@ -147,9 +146,8 @@ public void request(long n) {

@Override
public void cancel() {
DisposableHelper.dispose(timer);
worker.dispose();
s.cancel();
worker.dispose();
}
}
}
16 changes: 6 additions & 10 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeoutTimed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,8 @@ public void onError(Throwable t) {
return;
}
done = true;
worker.dispose();
DisposableHelper.dispose(timer);
arbiter.onError(t, s);
worker.dispose();
}

@Override
Expand All @@ -165,16 +164,14 @@ public void onComplete() {
return;
}
done = true;
worker.dispose();
DisposableHelper.dispose(timer);
arbiter.onComplete(s);
worker.dispose();
}

@Override
public void dispose() {
worker.dispose();
DisposableHelper.dispose(timer);
s.cancel();
worker.dispose();
}

@Override
Expand Down Expand Up @@ -256,9 +253,9 @@ public void onError(Throwable t) {
return;
}
done = true;
dispose();

actual.onError(t);
worker.dispose();
}

@Override
Expand All @@ -267,16 +264,15 @@ public void onComplete() {
return;
}
done = true;
dispose();

actual.onComplete();
worker.dispose();
}

@Override
public void dispose() {
worker.dispose();
DisposableHelper.dispose(timer);
s.cancel();
worker.dispose();
}

@Override
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowTimed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ public void onError(Throwable t) {
drainLoop();
}

dispose();
actual.onError(t);
dispose();
}

@Override
Expand All @@ -170,8 +170,8 @@ public void onComplete() {
drainLoop();
}

dispose();
actual.onComplete();
dispose();
}

@Override
Expand Down Expand Up @@ -396,8 +396,8 @@ public void onNext(T t) {
} else {
window = null;
s.cancel();
dispose();
actual.onError(new MissingBackpressureException("Could not deliver window due to lack of requests"));
dispose();
return;
}
} else {
Expand All @@ -424,8 +424,8 @@ public void onError(Throwable t) {
drainLoop();
}

dispose();
actual.onError(t);
dispose();
}

@Override
Expand All @@ -435,8 +435,8 @@ public void onComplete() {
drainLoop();
}

dispose();
actual.onComplete();
dispose();
}

@Override
Expand Down Expand Up @@ -479,13 +479,13 @@ void drainLoop() {
if (d && (empty || isHolder)) {
window = null;
q.clear();
dispose();
Throwable err = error;
if (err != null) {
w.onError(err);
} else {
w.onComplete();
}
dispose();
return;
}

Expand All @@ -509,8 +509,8 @@ void drainLoop() {
window = null;
queue.clear();
s.cancel();
dispose();
a.onError(new MissingBackpressureException("Could not deliver first window due to lack of requests."));
dispose();
return;
}
}
Expand Down Expand Up @@ -550,8 +550,8 @@ void drainLoop() {
} else {
window = null;
s.cancel();
dispose();
actual.onError(new MissingBackpressureException("Could not deliver window due to lack of requests"));
dispose();
return;
}
} else {
Expand Down Expand Up @@ -683,8 +683,8 @@ public void onError(Throwable t) {
drainLoop();
}

dispose();
actual.onError(t);
dispose();
}

@Override
Expand All @@ -694,8 +694,8 @@ public void onComplete() {
drainLoop();
}

dispose();
actual.onComplete();
dispose();
}

@Override
Expand Down Expand Up @@ -747,7 +747,6 @@ void drainLoop() {

if (d && (empty || sw)) {
q.clear();
dispose();
Throwable e = error;
if (e != null) {
for (UnicastProcessor<T> w : ws) {
Expand All @@ -759,6 +758,7 @@ void drainLoop() {
}
}
ws.clear();
dispose();
return;
}

Expand Down
Loading