Skip to content

Commit e1b3838

Browse files
artem-zinnatullinakarnokd
authored andcommitted
Indicate source disposal in timeout(fallback) (#6365)
1 parent 2eda9d8 commit e1b3838

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

src/main/java/io/reactivex/Flowable.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16442,7 +16442,7 @@ public final Flowable<T> timeout(long timeout, TimeUnit timeUnit) {
1644216442
/**
1644316443
* Returns a Flowable that mirrors the source Publisher but applies a timeout policy for each emitted
1644416444
* item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
16445-
* the resulting Publisher begins instead to mirror a fallback Publisher.
16445+
* the source Publisher is disposed and resulting Publisher begins instead to mirror a fallback Publisher.
1644616446
* <p>
1644716447
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
1644816448
* <dl>
@@ -16476,7 +16476,8 @@ public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Publisher<? ex
1647616476
/**
1647716477
* Returns a Flowable that mirrors the source Publisher but applies a timeout policy for each emitted
1647816478
* item using a specified Scheduler. If the next item isn't emitted within the specified timeout duration
16479-
* starting from its predecessor, the resulting Publisher begins instead to mirror a fallback Publisher.
16479+
* starting from its predecessor, the source Publisher is disposed and resulting Publisher begins
16480+
* instead to mirror a fallback Publisher.
1648016481
* <p>
1648116482
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
1648216483
* <dl>

src/main/java/io/reactivex/Maybe.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4463,7 +4463,7 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit) {
44634463
/**
44644464
* Returns a Maybe that mirrors the source Maybe but applies a timeout policy for each emitted
44654465
* item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
4466-
* the resulting Maybe begins instead to mirror a fallback MaybeSource.
4466+
* the source MaybeSource is disposed and resulting Maybe begins instead to mirror a fallback MaybeSource.
44674467
* <p>
44684468
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
44694469
* <dl>
@@ -4491,7 +4491,8 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, MaybeSource<? ext
44914491
/**
44924492
* Returns a Maybe that mirrors the source Maybe but applies a timeout policy for each emitted
44934493
* item using a specified Scheduler. If the next item isn't emitted within the specified timeout duration
4494-
* starting from its predecessor, the resulting Maybe begins instead to mirror a fallback MaybeSource.
4494+
* starting from its predecessor, the source MaybeSource is disposed and resulting Maybe begins instead
4495+
* to mirror a fallback MaybeSource.
44954496
* <p>
44964497
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
44974498
* <dl>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13617,7 +13617,8 @@ public final Observable<T> timeout(long timeout, TimeUnit timeUnit) {
1361713617
/**
1361813618
* Returns an Observable that mirrors the source ObservableSource but applies a timeout policy for each emitted
1361913619
* item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
13620-
* the resulting ObservableSource begins instead to mirror a fallback ObservableSource.
13620+
* the source ObservableSource is disposed and resulting ObservableSource begins instead
13621+
* to mirror a fallback ObservableSource.
1362113622
* <p>
1362213623
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
1362313624
* <dl>
@@ -13644,7 +13645,8 @@ public final Observable<T> timeout(long timeout, TimeUnit timeUnit, ObservableSo
1364413645
/**
1364513646
* Returns an Observable that mirrors the source ObservableSource but applies a timeout policy for each emitted
1364613647
* item using a specified Scheduler. If the next item isn't emitted within the specified timeout duration
13647-
* starting from its predecessor, the resulting ObservableSource begins instead to mirror a fallback ObservableSource.
13648+
* starting from its predecessor, the source ObservableSource is disposed and resulting ObservableSource
13649+
* begins instead to mirror a fallback ObservableSource.
1364813650
* <p>
1364913651
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
1365013652
* <dl>

0 commit comments

Comments
 (0)