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

4.x: Fix 3+ arg Zip not working with immediate sources #828

Merged
merged 2 commits into from
Oct 10, 2018

Conversation

akarnokd
Copy link
Collaborator

@akarnokd akarnokd commented Oct 8, 2018

This PR fixes the issue with the 3+ argument Zip operator not producing anything with an immediate Observable.Return source(s).

The problem was that the per-source OnCompleted called the Dispose method which then called the overridden Dispose(bool) method inside ZipObservable that cleared the queue, thus the operator could never make a full row. The fix is to call the original Dispose(bool) which only disposes the upstream but leaves the queue alone.

Fixes: #824

@@ -524,7 +524,7 @@ public override void OnError(Exception error)

public override void OnCompleted()
{
Dispose();
base.Dispose(true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A small comment why the base (and not the own) method is called could be helpful for future readers.

@danielcweber danielcweber merged commit f7d668d into dotnet:master Oct 10, 2018
@danielcweber
Copy link
Collaborator

@onovotny I cherry picked this bugfix for a v4.1.2 release, bumped the version, pushed it to rel/v4.1.2.

@clairernovotny
Copy link
Member

Okay, it's rolling out to NuGet now. BTW, for bugfix/patch releases, I think we should make those to the rel/v4.1 branch and keep branches for major/minor updates. I've pushed the changes into the rel/v4.1 branch.

@danielcweber
Copy link
Collaborator

Alright!

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.

Zip operator doesn't work properly for more than 2 streams
4 participants