Skip to content

Commit 2c84c9d

Browse files
committed
fix
1 parent 192fbab commit 2c84c9d

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

src/Ev.ServiceBus/Reception/Extensions/MessageContextExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ private static async Task SendToSourceAsync(this MessageContext messageContext,
3333
case ClientType.Queue:
3434
{
3535
// For queues, ResourceId is directly the queue name
36-
var sender = client.CreateSender(messageContext.ResourceId);
36+
await using var sender = client.CreateSender(messageContext.ResourceId);
3737
await sender.SendMessageAsync(message, cancellationToken);
3838
break;
3939
}
4040
case ClientType.Subscription:
4141
{
4242
// For subscriptions, ResourceId is in format "topicName/Subscriptions/subscriptionName"
4343
var topicName = messageContext.ResourceId.Split('/')[0];
44-
var sender = client.CreateSender(topicName);
44+
await using var sender = client.CreateSender(topicName);
4545
await sender.SendMessageAsync(message, cancellationToken);
4646
break;
4747
}

src/Ev.ServiceBus/Reception/MessageReceptionHandler.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,14 @@ public async Task HandleMessageAsync(MessageContext context)
5353

5454
if (_serviceBusOptions.Settings.UseIsolation)
5555
{
56-
var expectedIsolationKey = _serviceBusOptions.Settings.IsolationKey
57-
?? throw new ArgumentNullException(_serviceBusOptions.Settings.IsolationKey);
56+
var expectedIsolationKey = _serviceBusOptions.Settings.IsolationKey;
5857

5958
var receivedIsolationKey = context.IsolationKey
6059
?? string.Empty;
6160

6261
if (receivedIsolationKey != expectedIsolationKey)
6362
{
64-
await HandleIsolationKeyMismatchAsync(context, expectedIsolationKey, receivedIsolationKey);
63+
await HandleIsolationKeyMismatchAsync(context, expectedIsolationKey!, receivedIsolationKey);
6564
return;
6665
}
6766
}
@@ -127,10 +126,9 @@ private async Task HandleIsolationKeyMismatchAsync(MessageContext context, strin
127126
{
128127
_logger.IgnoreMessage(expectedKey, receivedKey);
129128

130-
var connectionSettings = _serviceBusOptions.Settings.ConnectionSettings
131-
?? throw new ArgumentNullException(nameof(_serviceBusOptions.Settings.ConnectionSettings));
129+
var connectionSettings = _serviceBusOptions.Settings.ConnectionSettings;
132130

133-
var client = _registry.CreateOrGetServiceBusClient(connectionSettings)
131+
var client = _registry.CreateOrGetServiceBusClient(connectionSettings!)
134132
?? throw new InvalidOperationException("Failed to create ServiceBusClient");
135133

136134
await context.CompleteAndResendMessageAsync(

0 commit comments

Comments
 (0)