Skip to content

fix: correct disposal ordering to prevent ObjectDisposedException during shutdown #89

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
niemyjski merged 4 commits into from
Jun 9, 2026
Merged

fix: correct disposal ordering to prevent ObjectDisposedException during shutdown #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c55954
fix: correct disposal ordering to prevent ObjectDisposedException dur…
niemyjski Jun 9, 2026
0ea016f
refactor: use atomic if (!SignalDispose()) guard pattern
niemyjski Jun 9, 2026
3f6acb9
Merge branch 'main' into fix/dispose-cts-ordering
niemyjski Jun 9, 2026
e3b21d4
bump deps
niemyjski Jun 9, 2026
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
16 changes: 14 additions & 2 deletions src/Foundatio.AzureServiceBus/Queues/AzureServiceBusQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,11 @@ private CreateQueueOptions CreateQueueOptions()

public override void Dispose()
{
base.Dispose();
if (!SignalDispose())
{
_logger.LogTrace("Queue {QueueName} ({QueueId}) dispose was already called", _options.Name, QueueId);
return;
}

if (_queueSender is not null)
{
Expand All @@ -640,11 +644,17 @@ public override void Dispose()
{
_client.Value.DisposeAsync().AsTask().GetAwaiter().GetResult();
}

base.Dispose();
}

public async ValueTask DisposeAsync()
{
base.Dispose();
if (!SignalDispose())
{
_logger.LogTrace("Queue {QueueName} ({QueueId}) async dispose was already called", _options.Name, QueueId);
return;
}

if (_queueSender is not null)
{
Expand All @@ -662,6 +672,8 @@ public async ValueTask DisposeAsync()
{
await _client.Value.DisposeAsync().AnyContext();
}

base.Dispose();
}

private async Task DeadLetterMessageAsync(AzureServiceBusQueueEntry<T> entry)
Expand Down
2 changes: 1 addition & 1 deletion tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<NoWarn>$(NoWarn);CS1591;NU1701</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.4" PrivateAssets="All" />
Expand Down
Loading