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

Fix Merge: backpressure + scalarValueQueue don't play nicely #1726

Merged
merged 3 commits into from
Oct 6, 2014

Conversation

benjchristensen
Copy link
Member

Manual merge of unit tests and fix by @dmgd for #1723

Thank you @dmgd for debugging this as merge is very complicated code (unfortunately).

dmgd and others added 3 commits October 5, 2014 20:36
…g during request(..) when the last value emitted was from scalarValueQueue
This comment is no longer correct. 1420 was resolved.
The `wip` variable needs its access to be synchronized. Then it calls drainAndComplete outside the lock.
benjchristensen added a commit that referenced this pull request Oct 6, 2014
Fix Merge: backpressure + scalarValueQueue don't play nicely
@benjchristensen benjchristensen merged commit 84c88bd into ReactiveX:1.x Oct 6, 2014
@benjchristensen benjchristensen deleted the fix-merge-1723 branch October 6, 2014 03:55
@benjchristensen benjchristensen deleted the fix-merge-1723 branch October 6, 2014 03:55
@dmgd
Copy link
Contributor

dmgd commented Oct 6, 2014

RxJava is really useful so happy to help!

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

Successfully merging this pull request may close these issues.

2 participants