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.

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

1.x: fix Completable.onErrorResumeNext unsubscribe not propagated #5225

Merged
merged 1 commit into from
Mar 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/main/java/rx/Completable.java
Original file line number Diff line number Diff line change
Expand Up @@ -1729,6 +1729,7 @@ public final Completable onErrorResumeNext(final Func1<? super Throwable, ? exte
@Override
public void call(final rx.CompletableSubscriber s) {
final SerialSubscription sd = new SerialSubscription();
s.onSubscribe(sd);
unsafeSubscribe(new rx.CompletableSubscriber() {

@Override
Expand Down
63 changes: 63 additions & 0 deletions src/test/java/rx/internal/operators/CompletableOnErrorXTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/**
* Copyright 2016 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package rx.internal.operators;

import static org.junit.Assert.*;
import org.junit.Test;

import rx.Completable;
import rx.functions.Func1;
import rx.observers.AssertableSubscriber;
import rx.subjects.PublishSubject;

public class CompletableOnErrorXTest {

@Test
public void nextUnsubscribe() {
PublishSubject<Integer> ps = PublishSubject.create();

AssertableSubscriber<Void> as = ps.toCompletable()
.onErrorResumeNext(new Func1<Throwable, Completable>() {
@Override
public Completable call(Throwable e) {
return Completable.complete();
}
})
.test();

assertTrue(ps.hasObservers());

as.unsubscribe();

assertFalse("Still subscribed!", ps.hasObservers());
}

@Test
public void completeUnsubscribe() {
PublishSubject<Integer> ps = PublishSubject.create();

AssertableSubscriber<Void> as = ps.toCompletable()
.onErrorComplete()
.test();

assertTrue(ps.hasObservers());

as.unsubscribe();

assertFalse("Still subscribed!", ps.hasObservers());
}
}