Skip to content

swallow-content-dispose-exception#2201

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
alexeyzimarev merged 2 commits into from
May 26, 2024
Merged

swallow-content-dispose-exception #2201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2439bc5
Swallow disposal exception that might occur when disposing the conten…
alexeyzimarev May 22, 2024
c13a00d
Merge branch 'refs/heads/dev' into swallow-content-dispose-exception
alexeyzimarev May 26, 2024
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: 8 additions & 2 deletions src/RestSharp/Request/RequestContent.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
namespace RestSharp;

class RequestContent(IRestClient client, RestRequest request) : IDisposable {
readonly List<Stream> _streams = new();
readonly List<Stream> _streams = [];
readonly ParametersCollection _parameters = new RequestParameters(request.Parameters.Union(client.DefaultParameters));

HttpContent? Content { get; set; }
Expand DownExpand Up@@ -222,6 +222,12 @@ void ReplaceHeader(string name, string? value) {

public void Dispose() {
_streams.ForEach(x => x.Dispose());
Content?.Dispose();

try {
Content?.Dispose();
}
catch (Exception e) when (e is ObjectDisposedException or NullReferenceException) {
// Already disposed
}
}
}