3.x: Fix Flowable.switchMap not canceling properly during onNext-cancel races #6917
+82
−3
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.
There was an unnecessary
active.lazySet(null)
which prevented cancellation of the inner source under some circumstances.More specifically, when one thread issued a
cancel
, the cancelled flag was set, then another thread indrain
would loop around, see thecancelled
flag and clear the reference. Back in the cancelling thread, thedisposeInner
would only seenull
and do nothing.Observable.switchMap did not have this mistake. Both received unit tests to verify the correct behavior.
2.x will be fixed in a separate PR.
Resolves #6914