Skip to content

Commit 2332df2

Browse files
authored
2.x: fix & update Observable.repeatWhen and redoWhen (#4911)
1 parent 5b6d1f8 commit 2332df2

File tree

8 files changed

+406
-390
lines changed

8 files changed

+406
-390
lines changed

src/main/java/io/reactivex/Observable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8884,7 +8884,7 @@ public final Observable<T> repeatUntil(BooleanSupplier stop) {
88848884
@SchedulerSupport(SchedulerSupport.NONE)
88858885
public final Observable<T> repeatWhen(final Function<? super Observable<Object>, ? extends ObservableSource<?>> handler) {
88868886
ObjectHelper.requireNonNull(handler, "handler is null");
8887-
return RxJavaPlugins.onAssembly(new ObservableRedo<T>(this, ObservableInternalHelper.repeatWhenHandler(handler), false));
8887+
return RxJavaPlugins.onAssembly(new ObservableRepeatWhen<T>(this, handler));
88888888
}
88898889

88908890
/**
@@ -9560,7 +9560,7 @@ public final Observable<T> retryUntil(final BooleanSupplier stop) {
95609560
public final Observable<T> retryWhen(
95619561
final Function<? super Observable<Throwable>, ? extends ObservableSource<?>> handler) {
95629562
ObjectHelper.requireNonNull(handler, "handler is null");
9563-
return RxJavaPlugins.onAssembly(new ObservableRedo<T>(this, ObservableInternalHelper.retryWhenHandler(handler), true));
9563+
return RxJavaPlugins.onAssembly(new ObservableRetryWhen<T>(this, handler));
95649564
}
95659565

95669566
/**

src/main/java/io/reactivex/internal/observers/ToNotificationObserver.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/main/java/io/reactivex/internal/operators/observable/ObservableRedo.java

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)