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

3.x: Fix mergeWith not cancelling the other source if the main errors #6598

Merged
merged 2 commits into from
Jul 30, 2019

Conversation

akarnokd
Copy link
Member

The mergeWith implementations' onError (called by the main source) cancelled the main source instead of cancelling the other source. This mistake affects all 2 x 3 overloads of the operator.

Fixes #6597

@akarnokd akarnokd added this to the 3.0 milestone Jul 29, 2019
@codecov
Copy link

codecov bot commented Jul 29, 2019

Codecov Report

Merging #6598 into 3.x will decrease coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##                3.x   #6598      +/-   ##
===========================================
- Coverage     98.22%   98.2%   -0.03%     
+ Complexity     6185    6184       -1     
===========================================
  Files           678     678              
  Lines         44908   44908              
  Branches       6214    6214              
===========================================
- Hits          44111   44100      -11     
- Misses          266     272       +6     
- Partials        531     536       +5
Impacted Files Coverage Δ Complexity Δ
...nal/operators/flowable/FlowableMergeWithMaybe.java 100% <100%> (ø) 2 <0> (ø) ⬇️
...erators/flowable/FlowableMergeWithCompletable.java 100% <100%> (ø) 2 <0> (ø) ⬇️
...al/operators/flowable/FlowableMergeWithSingle.java 100% <100%> (ø) 2 <0> (ø) ⬇️
...operators/observable/ObservableMergeWithMaybe.java 100% <100%> (ø) 2 <0> (ø) ⬇️
...perators/observable/ObservableMergeWithSingle.java 99.06% <100%> (-0.94%) 2 <0> (ø)
...ors/observable/ObservableMergeWithCompletable.java 100% <100%> (ø) 2 <0> (ø) ⬇️
...l/operators/observable/ObservableFlatMapMaybe.java 89.54% <0%> (-3.93%) 2% <0%> (ø)
...activex/internal/observers/QueueDrainObserver.java 97.43% <0%> (-2.57%) 21% <0%> (-1%)
...ternal/operators/completable/CompletableMerge.java 96.42% <0%> (-2.39%) 2% <0%> (ø)
...ava/io/reactivex/processors/BehaviorProcessor.java 96.58% <0%> (-1.47%) 51% <0%> (+1%)
... and 16 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 177d468...76583a1. Read the comment docs.

Copy link

@Mikey-Burns Mikey-Burns left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor typo in some of the test method names. The rest of the fix looks great.

@akarnokd akarnokd merged commit e00c499 into ReactiveX:3.x Jul 30, 2019
@akarnokd akarnokd deleted the MergeWithCancelOtherFix3x branch July 30, 2019 07:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants