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: Fix refCount() not resetting when cross-canceled #6629

Merged
merged 2 commits into from
Aug 22, 2019
Merged

2.x: Fix refCount() not resetting when cross-canceled #6629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f59190
2.x: Fix refCount() not resetting when cross-canceled
akarnokd Aug 21, 2019
2973758
Undo test timeout comment
akarnokd Aug 22, 2019
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
40 changes: 30 additions & 10 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableRefCount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,22 +115,42 @@ void cancel(RefConnection rc) {

void terminated(RefConnection rc) {
synchronized (this) {
if (connection != null && connection == rc) {
connection = null;
if (rc.timer != null) {
rc.timer.dispose();
if (source instanceof FlowablePublishClassic) {
if (connection != null && connection == rc) {
connection = null;
clearTimer(rc);
}
}
if (--rc.subscriberCount == 0) {
if (source instanceof Disposable) {
((Disposable)source).dispose();
} else if (source instanceof ResettableConnectable) {
((ResettableConnectable)source).resetIf(rc.get());

if (--rc.subscriberCount == 0) {
reset(rc);
}
} else {
if (connection != null && connection == rc) {
clearTimer(rc);
if (--rc.subscriberCount == 0) {
connection = null;
reset(rc);
}
}
}
}
}

void clearTimer(RefConnection rc) {
if (rc.timer != null) {
rc.timer.dispose();
rc.timer = null;
}
}

void reset(RefConnection rc) {
if (source instanceof Disposable) {
((Disposable)source).dispose();
} else if (source instanceof ResettableConnectable) {
((ResettableConnectable)source).resetIf(rc.get());
}
}

void timeout(RefConnection rc) {
synchronized (this) {
if (rc.subscriberCount == 0 && rc == connection) {
Expand Down
40 changes: 30 additions & 10 deletions src/main/java/io/reactivex/internal/operators/observable/ObservableRefCount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,42 @@ void cancel(RefConnection rc) {

void terminated(RefConnection rc) {
synchronized (this) {
if (connection != null && connection == rc) {
connection = null;
if (rc.timer != null) {
rc.timer.dispose();
if (source instanceof ObservablePublishClassic) {
if (connection != null && connection == rc) {
connection = null;
clearTimer(rc);
}
}
if (--rc.subscriberCount == 0) {
if (source instanceof Disposable) {
((Disposable)source).dispose();
} else if (source instanceof ResettableConnectable) {
((ResettableConnectable)source).resetIf(rc.get());

if (--rc.subscriberCount == 0) {
reset(rc);
}
} else {
if (connection != null && connection == rc) {
clearTimer(rc);
if (--rc.subscriberCount == 0) {
connection = null;
reset(rc);
}
}
}
}
}

void clearTimer(RefConnection rc) {
if (rc.timer != null) {
rc.timer.dispose();
rc.timer = null;
}
}

void reset(RefConnection rc) {
if (source instanceof Disposable) {
((Disposable)source).dispose();
} else if (source instanceof ResettableConnectable) {
((ResettableConnectable)source).resetIf(rc.get());
}
}

void timeout(RefConnection rc) {
synchronized (this) {
if (rc.subscriberCount == 0 && rc == connection) {
Expand Down
19 changes: 19 additions & 0 deletions src/test/java/io/reactivex/internal/operators/flowable/FlowableRefCountAltTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,4 +1443,23 @@ public void publishRefCountShallBeThreadSafe() {
.assertComplete();
}
}

@Test
public void upstreamTerminationTriggersAnotherCancel() throws Exception {
ReplayProcessor<Integer> rp = ReplayProcessor.create();
rp.onNext(1);
rp.onComplete();

Flowable<Integer> shared = rp.share();

shared
.buffer(shared.debounce(5, TimeUnit.SECONDS))
.test()
.assertValueCount(2);

shared
.buffer(shared.debounce(5, TimeUnit.SECONDS))
.test()
.assertValueCount(2);
}
}
20 changes: 20 additions & 0 deletions src/test/java/io/reactivex/internal/operators/flowable/FlowableRefCountTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package io.reactivex.internal.operators.flowable;

import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;

import java.io.IOException;
Expand Down Expand Up @@ -1436,4 +1437,23 @@ public void disconnectBeforeConnect() {

flowable.take(1).test().assertResult(2);
}

@Test
public void upstreamTerminationTriggersAnotherCancel() throws Exception {
ReplayProcessor<Integer> rp = ReplayProcessor.create();
rp.onNext(1);
rp.onComplete();

Flowable<Integer> shared = rp.share();

shared
.buffer(shared.debounce(5, TimeUnit.SECONDS))
.test()
.assertValueCount(2);

shared
.buffer(shared.debounce(5, TimeUnit.SECONDS))
.test()
.assertValueCount(2);
}
}
19 changes: 19 additions & 0 deletions src/test/java/io/reactivex/internal/operators/observable/ObservableRefCountAltTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,4 +1399,23 @@ public void publishRefCountShallBeThreadSafe() {
.assertComplete();
}
}

@Test
public void upstreamTerminationTriggersAnotherCancel() throws Exception {
ReplaySubject<Integer> rs = ReplaySubject.create();
rs.onNext(1);
rs.onComplete();

Observable<Integer> shared = rs.share();

shared
.buffer(shared.debounce(5, TimeUnit.SECONDS))
.test()
.assertValueCount(2);

shared
.buffer(shared.debounce(5, TimeUnit.SECONDS))
.test()
.assertValueCount(2);
}
}
21 changes: 20 additions & 1 deletion src/test/java/io/reactivex/internal/operators/observable/ObservableRefCountTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ public Integer apply(Integer t1, Integer t2) {
to2.assertValue(30);
}

@Test(timeout = 10000)
@Test//(timeout = 10000)
public void testUpstreamErrorAllowsRetry() throws InterruptedException {
final AtomicInteger intervalSubscribed = new AtomicInteger();
Observable<String> interval =
Expand Down Expand Up @@ -1380,4 +1380,23 @@ public void disconnectBeforeConnect() {

observable.take(1).test().assertResult(2);
}

@Test
public void upstreamTerminationTriggersAnotherCancel() throws Exception {
ReplaySubject<Integer> rs = ReplaySubject.create();
rs.onNext(1);
rs.onComplete();

Observable<Integer> shared = rs.share();

shared
.buffer(shared.debounce(5, TimeUnit.SECONDS))
.test()
.assertValueCount(2);

shared
.buffer(shared.debounce(5, TimeUnit.SECONDS))
.test()
.assertValueCount(2);
}
}