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 #1642 Fix null-emitting combineLatest #1705

Merged
merged 1 commit into from
Oct 2, 2014
Merged

Issue #1642 Fix null-emitting combineLatest #1705

merged 1 commit into from
Oct 2, 2014

Conversation

edenman
Copy link

@edenman edenman commented Sep 29, 2014

@dpsm
Copy link
Contributor

dpsm commented Sep 29, 2014

LGTM

@benjchristensen
Copy link
Member

Thanks for fixing this. Stupid bug on my part.

It should have been:

buffer.getValue(o);
// or
buffer.accept(o, child);

Your fix does the same thing.

benjchristensen added a commit that referenced this pull request Oct 2, 2014
Issue #1642 Fix null-emitting combineLatest
@benjchristensen benjchristensen merged commit 9fb979c into ReactiveX:1.x Oct 2, 2014
@edenman
Copy link
Author

edenman commented Oct 15, 2014

@benjchristensen just saw that this didn't make it into 0.20.5. Do I need to do something to make sure it gets into 0.20.6? Can't tell how you guys are managing the various release branches.

@benjchristensen
Copy link
Member

This was merged into 1.x and is in the 1.0 releases. (it was in 1.0.0-rc.4 https://github.com/ReactiveX/RxJava/releases/tag/v1.0.0-rc.4)

If you want it also in the 0.20.x releases go ahead and submit another PR against that branch.

1.x is where most of the focus is as we work towards the 1.0 Final release scheduled for November 18th.

@edenman
Copy link
Author

edenman commented Oct 16, 2014

Ah. I tried switching us over to 1.0.0-rc4 but one of our dependencies uses the com.netflix packaging and Android won't let us include both in our apk (dex complains about duplicate classes). #1761

@benjchristensen
Copy link
Member

one of our dependencies uses the com.netflix packaging

Yes, it's going to be a painful one-time migration to get onto 1.0. Once we hit 1.0 Final I'll encourage everyone to do so.

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.

3 participants