Skip to content

Commit

Permalink
Fixes the Minio5.0 nuget cancellationToken issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Ersan Bozduman committed Sep 20, 2023
1 parent 9d04876 commit 69fabf8
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Minio/Helper/OperationsHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@ private Task GetObjectFileAsync(GetObjectArgs args, ObjectStat objectStat,

async Task callbackAsync(Stream stream, CancellationToken cancellationToken)
{
using var dest = new FileStream(tempFileName, FileMode.Create, FileAccess.Write);
#if NETSTANDARD
using var dest = new FileStream(tempFileName, FileMode.Create, FileAccess.Write);
await stream.CopyToAsync(dest).ConfigureAwait(false);
#else
var dest = new FileStream(tempFileName, FileMode.Create, FileAccess.Write);
await using (dest.ConfigureAwait(false))
await stream.CopyToAsync(dest, cancellationToken).ConfigureAwait(false);
#endif
}
Expand All @@ -90,7 +92,7 @@ async Task callbackAsync(Stream stream, CancellationToken cancellationToken)
cts.CancelAfter(TimeSpan.FromSeconds(15));
args.WithCallbackStream(async (stream, cancellationToken) =>
{
await callbackAsync(stream, cts.Token).ConfigureAwait(false);
await callbackAsync(stream, cancellationToken).ConfigureAwait(false);
Utils.MoveWithReplace(tempFileName, args.FileName);
});
return GetObjectStreamAsync(args, cancellationToken);
Expand Down

0 comments on commit 69fabf8

Please sign in to comment.