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

[Issue #831] Fix for OperationJoin race condition #832

Merged
merged 1 commit into from
Feb 7, 2014

Conversation

duncani
Copy link
Contributor

@duncani duncani commented Feb 7, 2014

This is to fix the race condition outlined in issue #831 .
The join now grabs a copy of the other side's id in the first critical section then won't go higher than that in the iteration of the other side's values (now using entrySet()).

@cloudbees-pull-request-builder

RxJava-pull-requests #753 FAILURE
Looks like there's a problem with this pull request

@duncani
Copy link
Contributor Author

duncani commented Feb 7, 2014

Looks like a problem with the build server's local repo rather than the pull request.

Caused by: hudson.plugins.git.GitException: Command "git checkout -b master origin/master" returned status code 1:
stdout: rxjava-core/src/test/java/rx/util/CompositeExceptionTest.java: needs merge

@cloudbees-pull-request-builder

RxJava-pull-requests #754 FAILURE
Looks like there's a problem with this pull request

@benjchristensen
Copy link
Member

Looks to be passing when I run it on my machine.

Thank you for hunting this down and submitting a fix!

benjchristensen added a commit that referenced this pull request Feb 7, 2014
[Issue #831] Fix for OperationJoin race condition
@benjchristensen benjchristensen merged commit a1df031 into ReactiveX:master Feb 7, 2014
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.

None yet

3 participants