Rework some disposing #2128
Merged
Rework some disposing #2128
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jnyrup
commented
Apr 8, 2023
| } | ||
| catch | ||
| { | ||
| await browser.DisposeAsync().ConfigureAwait(false); |
There was a problem hiding this comment.
if initAction or AttachAsync throws an exception, we now explicitly dispose browser.
| @@ -171,8 +171,14 @@ internal class WaitTask : IDisposable | |||
|
|
|||
| public void Dispose() | |||
| { | |||
| Dispose(true); | |||
| GC.SuppressFinalize(this); | |||
There was a problem hiding this comment.
Since the class is now sealed and there is not finalizer, there's no longer a need for GC.SuppressFinalize(this).
| public Task DeleteAsync(CancellationToken cancellationToken = default) | ||
| => _deleteTask ?? (_deleteTask = DeleteAsync(Path, CancellationToken.None)); | ||
|
|
||
| protected virtual void Dispose(bool disposing) | ||
| { | ||
| if (_deleteTask == null) | ||
| { | ||
| _ = DeleteAsync(); | ||
| } | ||
| } | ||
|
|
||
| private static async Task DeleteAsync(string path, CancellationToken cancellationToken = default) | ||
| private static async Task DeleteAsync(string path) |
There was a problem hiding this comment.
DeleteAsync(CancellationToken cancellationToken = default) has never been used outside this class since it was introduced in #585, so cancellationToken is always CancellationToken.None.
I don't have the full overview of what #585 does, so I refrained from removing the fire-and-forget invocation of of DeleteAsync.
kblok
approved these changes
Apr 8, 2023
| } | ||
| catch | ||
| { | ||
| await browser.DisposeAsync().ConfigureAwait(false); |
kblok
approved these changes
Apr 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Found some more places related to disposing to rework.
I've split the changes into three separate commits to ease reviewing.