Merge and Cleanup of #972#1040
Merged
benjchristensen merged 4 commits intoReactiveX:masterfrom Apr 16, 2014
Merged
Conversation
…to pull-972 Conflicts: rxjava-core/src/main/java/rx/operators/OperatorCache.java Updated OperatorCache to use `unsafeSubscribe` to fix merge conflicts.
Since the collection is being returned we don't want to also inject it as an argument, so I migrated to Action0 from Action1 as per discussion at ReactiveX#972 (comment)
|
RxJava-pull-requests #956 SUCCESS |
Member
|
The changes look fine. |
Member
Author
|
Great, thanks for the review. Going to merge and release. I really appreciate your involvement on this one, thank you. |
benjchristensen
added a commit
that referenced
this pull request
Apr 16, 2014
Merge and Cleanup of #972
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.
@akarnokd I have manually merged your changes (#972) and migrated from
Action1toAction0as we discussed.Can you review what I did on top of your changes to make sure it's correct. It seems correct to me but there is some nuanced concurrency here (obviously, hence your fixes) and I would appreciate your validation.