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.

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

Fixes the Minio5.0 nuget cancellationToken issue #866

Merged
merged 2 commits into from
Sep 28, 2023
Merged

Fixes the Minio5.0 nuget cancellationToken issue #866

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69fabf8
Fixes the Minio5.0 nuget cancellationToken issue
Sep 20, 2023
802fd9d
lint changes
Sep 20, 2023
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
10 changes: 7 additions & 3 deletions Minio/Helper/OperationsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,15 @@ 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
await stream.CopyToAsync(dest, cancellationToken).ConfigureAwait(false);
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 +94,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