2.x: Fix window(Observable|Callable) upstream handling #5887
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the upstream handling in
Observable.window(ObservableSource)
andObservable.window(Callable<ObservableSource>)
operators to make sure if both the main output and the inner windows have been disposed, the upstream is also disposed.Fixes #5881.
Remark:
There are a couple of
w != null
checks showing up as partially covered. In theory, with the right interleaving,w
can becomenull
, but unfortunately the usualTestHelper.race()
testing is unlikely to trigger that case. There would be a higher chance with 3 threads (one disposing, one completing the main and one completing the inner window) but the current CI is effectively 1.5 - 2 cores/threads that tend to not produce a thorough interleaving.