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

1.x: Completable.mergeDelayError check unsafe availability #4941

Merged
merged 1 commit into from
Dec 28, 2016

Conversation

akarnokd
Copy link
Member

@akarnokd akarnokd commented Dec 28, 2016

This PR fixes the unconditional use of MpscLinkedQueue when Unsafe is not available or has been disabled inside CompletableOnSubscribeMergeDelayErrorIterable.

Related: #4940

@codecov-io
Copy link

codecov-io commented Dec 28, 2016

Current coverage is 84.23% (diff: 33.33%)

Merging #4941 into 1.x will decrease coverage by 0.03%

@@                1.x      #4941   diff @@
==========================================
  Files           288        288          
  Lines         17804      17806     +2   
  Methods           0          0          
  Messages          0          0          
  Branches       2697       2698     +1   
==========================================
- Hits          15004      14999     -5   
- Misses         1952       1953     +1   
- Partials        848        854     +6   

Powered by Codecov. Last update 4406bcb...0bce846

@akarnokd akarnokd merged commit 6de5c6f into ReactiveX:1.x Dec 28, 2016
@akarnokd akarnokd deleted the FixUnsafeMpscUsage branch December 28, 2016 21:03
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.

3 participants