Skip to content

Commit 5ea209d

Browse files
authored
Fix missing ConfigureAwait(false) in FutureEnumerable (#2678)
1 parent cbcca54 commit 5ea209d

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/NHibernate/Async/Multi/QueryBatchExtensions.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,16 @@ partial class FutureList<TResult> : IFutureList<TResult>
6161
}
6262
}
6363

64+
partial class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
65+
{
66+
67+
public async Task<IEnumerable<TResult>> GetEnumerableAsync(CancellationToken cancellationToken = default(CancellationToken))
68+
{
69+
cancellationToken.ThrowIfCancellationRequested();
70+
return await (_result.GetValueAsync(cancellationToken)).ConfigureAwait(false);
71+
}
72+
}
73+
6474
#endregion Helper classes
6575
}
6676
}

src/NHibernate/Multi/QueryBatchExtensions.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ public IList<TResult> Value
567567
}
568568
}
569569

570-
class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
570+
partial class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
571571
{
572572
private readonly IFutureList<TResult> _result;
573573

@@ -576,11 +576,6 @@ public FutureEnumerable(IQueryBatch batch, IQueryBatchItem<TResult> query)
576576
_result = new FutureList<TResult>(batch, query);
577577
}
578578

579-
public async Task<IEnumerable<TResult>> GetEnumerableAsync(CancellationToken cancellationToken = default(CancellationToken))
580-
{
581-
return await _result.GetValueAsync(cancellationToken);
582-
}
583-
584579
public IEnumerable<TResult> GetEnumerable()
585580
{
586581
return _result.Value;

0 commit comments

Comments
 (0)