Skip to content

Commit 0d155ae

Browse files
committed
Merge pull request #2578 from ReactiveX/revert-2575-subscribeOn_subscription
Revert "subscribeOn drops the subscriptions returned from the scheduler....
2 parents fe3cc75 + 6cd17db commit 0d155ae

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
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-
subscriber.add(inner.schedule(new Action0() {
57+
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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,6 @@ 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();
613612

614613
verifyNoMoreInteractions(sourceNext);
615614
verifyNoMoreInteractions(sourceCompleted);
@@ -669,7 +668,6 @@ public void testIssue2191_SchedulerUnsubscribeOnError() throws Exception {
669668

670669
verify(spiedWorker, times(1)).unsubscribe();
671670
verify(sourceUnsubscribed, times(1)).call();
672-
verify(mockSubscription, times(1)).unsubscribe();
673671

674672
verifyNoMoreInteractions(sourceNext);
675673
verifyNoMoreInteractions(sourceCompleted);

0 commit comments

Comments
 (0)