Skip to content

Make sync and async disposal of Renderer behave the same #34511

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
merged 2 commits into from
Jul 20, 2021
Merged

Make sync and async disposal of Renderer behave the same #34511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
050fa47
Make sync and async disposal of Renderer behave the same
pranavkm Jul 19, 2021
c8f9e10
Use Dispose instead of DisposeAsync to clear hot reload state
pranavkm Jul 20, 2021
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
12 changes: 6 additions & 6 deletions src/Components/Components/src/RenderTree/Renderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

#nullable disable warnings
Expand Down Expand Up @@ -959,6 +959,11 @@ private void HandleExceptionViaErrorBoundary(Exception error, ComponentState? er
protected virtual void Dispose(bool disposing)
{
Disposed = true;

if (TestableMetadataUpdate.IsSupported)
{
HotReloadManager.OnDeltaApplied -= RenderRootComponentsOnHotReload;
}

// It's important that we handle all exceptions here before reporting any of them.
// This way we can dispose all components before an error handler kicks in.
Expand Down Expand Up @@ -1058,11 +1063,6 @@ public void Dispose()
/// <inheritdoc />
public async ValueTask DisposeAsync()
{
if (TestableMetadataUpdate.IsSupported)
{
HotReloadManager.OnDeltaApplied -= RenderRootComponentsOnHotReload;
}

if (Disposed)
{
return;
Expand Down
Loading