2.x: fix Flowable.concatMapEager hang due to bad request management#4751
Merged
akarnokd merged 2 commits intoReactiveX:2.xfrom Oct 22, 2016
Merged
2.x: fix Flowable.concatMapEager hang due to bad request management#4751akarnokd merged 2 commits intoReactiveX:2.xfrom
akarnokd merged 2 commits intoReactiveX:2.xfrom
Conversation
Current coverage is 93.74% (diff: 73.91%)@@ 2.x #4751 diff @@
==========================================
Files 570 570
Lines 37067 37073 +6
Methods 0 0
Messages 0 0
Branches 5648 5651 +3
==========================================
- Hits 34764 34754 -10
- Misses 1171 1183 +12
- Partials 1132 1136 +4
|
JakeWharton
approved these changes
Oct 22, 2016
This was referenced Oct 22, 2016
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Flowable.concatMapEager's drain loop when encountering a finished inner jumped back to the beginning of the loop but disregarded the potentially changed request amount and just stopped emitting. The fix is to use the typical request management approach of reading the current request at the beginning of the loop and then committing the emission amount before trying to leave the loop.Related: #4620
In addition
TestHelper.assertErrorhas been changed to attach the whole unexpected exception to theAssertionError.