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 concatMap{Single|Maybe} null emission on dispose race #6060

Merged
merged 1 commit into from
Jun 22, 2018

Conversation

akarnokd
Copy link
Member

This PR fixes a bug in all 4 specialized concatMap implementation that allows null to be emitted when the success signal of the inner source races with the dispose signal of the sequence.

Likely fixes: #6059

@akarnokd akarnokd added this to the 2.2 milestone Jun 22, 2018
@akarnokd
Copy link
Member Author

A very similar thing happened in #5927 just after a release but this bug was there between 2.1.11 and 2.1.14.

@codecov
Copy link

codecov bot commented Jun 22, 2018

Codecov Report

Merging #6060 into 2.x will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #6060      +/-   ##
============================================
+ Coverage     98.26%   98.29%   +0.02%     
- Complexity     6188     6194       +6     
============================================
  Files           666      666              
  Lines         44802    44806       +4     
  Branches       6206     6206              
============================================
+ Hits          44025    44041      +16     
+ Misses          235      232       -3     
+ Partials        542      533       -9
Impacted Files Coverage Δ Complexity Δ
...ternal/operators/mixed/FlowableConcatMapMaybe.java 100% <100%> (ø) 2 <0> (ø) ⬇️
...ernal/operators/mixed/FlowableConcatMapSingle.java 100% <100%> (ø) 2 <0> (ø) ⬇️
...nal/operators/mixed/ObservableConcatMapSingle.java 100% <100%> (ø) 3 <0> (ø) ⬇️
...rnal/operators/mixed/ObservableConcatMapMaybe.java 100% <100%> (ø) 3 <0> (ø) ⬇️
...l/operators/observable/ObservableFlatMapMaybe.java 86.92% <0%> (-9.16%) 2% <0%> (ø)
.../operators/observable/ObservableFlatMapSingle.java 88.8% <0%> (-7.47%) 2% <0%> (ø)
.../io/reactivex/internal/schedulers/IoScheduler.java 89.24% <0%> (-2.16%) 9% <0%> (ø)
...ernal/operators/flowable/FlowableFromIterable.java 95.18% <0%> (-2.14%) 5% <0%> (ø)
...rnal/operators/flowable/FlowableSkipLastTimed.java 95.91% <0%> (-2.05%) 2% <0%> (ø)
...operators/observable/ObservableMergeWithMaybe.java 99.1% <0%> (-0.9%) 2% <0%> (ø)
... and 24 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 869c2aa...385e955. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[2.1.15] map method called with null
2 participants