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

2.x: Fix Flowable.flatMap not canceling the inner sources on outer error #6827

Merged
merged 1 commit into from Jan 9, 2020

Conversation

@akarnokd
Copy link
Member

akarnokd commented Jan 8, 2020

The outer onError did not cancel the inner sources. The Observable variant works correctly but both received an unit test to verify the behavior.

Fixes: #6825

@akarnokd akarnokd added Bug 2.x labels Jan 8, 2020
@codecov

This comment has been minimized.

Copy link

codecov bot commented Jan 8, 2020

Codecov Report

Merging #6827 into 2.x will increase coverage by 0.05%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #6827      +/-   ##
============================================
+ Coverage     98.24%   98.29%   +0.05%     
- Complexity     6348     6350       +2     
============================================
  Files           677      677              
  Lines         45532    45535       +3     
  Branches       6334     6336       +2     
============================================
+ Hits          44733    44759      +26     
+ Misses          253      244       -9     
+ Partials        546      532      -14
Impacted Files Coverage Δ Complexity Δ
...x/internal/operators/flowable/FlowableFlatMap.java 89.55% <100%> (-0.45%) 4 <0> (ø)
...nternal/operators/observable/ObservableCreate.java 89.74% <0%> (-7.7%) 2% <0%> (ø)
...l/operators/observable/ObservableFlatMapMaybe.java 86.92% <0%> (-2.62%) 2% <0%> (ø)
...ernal/operators/flowable/FlowableFromIterable.java 96.25% <0%> (-1.61%) 5% <0%> (ø)
...perators/observable/ObservableMergeWithSingle.java 99.06% <0%> (-0.94%) 2% <0%> (ø)
...internal/operators/flowable/FlowableSwitchMap.java 94.9% <0%> (-0.47%) 3% <0%> (ø)
...ex/internal/operators/flowable/FlowableCreate.java 97.09% <0%> (ø) 6% <0%> (ø) ⬇️
...main/java/io/reactivex/subjects/ReplaySubject.java 97.51% <0%> (+0.41%) 50% <0%> (ø) ⬇️
...perators/mixed/ObservableConcatMapCompletable.java 100% <0%> (+0.75%) 3% <0%> (ø) ⬇️
... and 14 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ea2c796...c3caffb. Read the comment docs.

@akarnokd akarnokd merged commit 0b3b300 into ReactiveX:2.x Jan 9, 2020
3 checks passed
3 checks passed
codecov/patch 100% of diff hit (target 95%)
Details
codecov/project 98.29% (target 95%)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@akarnokd akarnokd deleted the akarnokd:FlatMapInnerCancelFix2x branch Jan 9, 2020
Copy link
Contributor

davidmoten left a comment

looks good, thanks, important fix!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.