Skip to content

Inline CancellationDisposable in SelectMany. #770

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 6, 2018
Merged

Inline CancellationDisposable in SelectMany. #770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/SelectMany.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ public TaskSelector(IObservable<TSource> source, Func<TSource, CancellationToken
internal sealed class _ : Sink<TSource, TResult>
{
private readonly object _gate = new object();
private readonly CancellationDisposable _cancel = new CancellationDisposable();
private readonly CancellationTokenSource _cancel = new CancellationTokenSource();

private readonly Func<TSource, CancellationToken, Task<TCollection>> _collectionSelector;
private readonly Func<TSource, TCollection, TResult> _resultSelector;
Expand All @@ -559,7 +559,7 @@ protected override void Dispose(bool disposing)
{
if (disposing)
{
_cancel.Dispose();
_cancel.Cancel();
}
base.Dispose(disposing);
}
Expand Down Expand Up @@ -639,7 +639,7 @@ private void OnCompletedTask(TSource value, Task<TCollection> task)
break;
case TaskStatus.Canceled:
{
if (!_cancel.IsDisposed)
if (!_cancel.IsCancellationRequested)
{
lock (_gate)
{
Expand Down Expand Up @@ -692,7 +692,7 @@ public TaskSelectorIndexed(IObservable<TSource> source, Func<TSource, int, Cance
internal sealed class _ : Sink<TSource, TResult>
{
private readonly object _gate = new object();
private readonly CancellationDisposable _cancel = new CancellationDisposable();
private readonly CancellationTokenSource _cancel = new CancellationTokenSource();

private readonly Func<TSource, int, CancellationToken, Task<TCollection>> _collectionSelector;
private readonly Func<TSource, int, TCollection, TResult> _resultSelector;
Expand All @@ -718,7 +718,7 @@ protected override void Dispose(bool disposing)
{
if (disposing)
{
_cancel.Dispose();
_cancel.Cancel();
}
base.Dispose(disposing);
}
Expand Down Expand Up @@ -800,7 +800,7 @@ private void OnCompletedTask(TSource value, int index, Task<TCollection> task)
break;
case TaskStatus.Canceled:
{
if (!_cancel.IsDisposed)
if (!_cancel.IsCancellationRequested)
{
lock (_gate)
{
Expand Down