Skip to content

Commit 9a76608

Browse files
committed
Merge pull request #2575 from abersnaze/subscribeOn_subscription
subscribeOn drops the subscriptions returned from the scheduler.
2 parents 9525e33 + c3ec2dc commit 9a76608

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/main/java/rx/internal/operators/OperatorSubscribeOn.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void onError(Throwable e) {
5454

5555
@Override
5656
public void onNext(final Observable<T> o) {
57-
inner.schedule(new Action0() {
57+
subscriber.add(inner.schedule(new Action0() {
5858

5959
@Override
6060
public void call() {
@@ -102,7 +102,7 @@ public void call() {
102102

103103
});
104104
}
105-
});
105+
}));
106106
}
107107

108108
};

src/test/java/rx/internal/operators/OperatorReplayTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@ public void testIssue2191_SchedulerUnsubscribe() throws Exception {
609609

610610
verify(spiedWorker, times(1)).unsubscribe();
611611
verify(sourceUnsubscribed, times(1)).call();
612+
verify(mockSubscription, times(1)).unsubscribe();
612613

613614
verifyNoMoreInteractions(sourceNext);
614615
verifyNoMoreInteractions(sourceCompleted);
@@ -668,6 +669,7 @@ public void testIssue2191_SchedulerUnsubscribeOnError() throws Exception {
668669

669670
verify(spiedWorker, times(1)).unsubscribe();
670671
verify(sourceUnsubscribed, times(1)).call();
672+
verify(mockSubscription, times(1)).unsubscribe();
671673

672674
verifyNoMoreInteractions(sourceNext);
673675
verifyNoMoreInteractions(sourceCompleted);

0 commit comments

Comments
 (0)