Skip to content

Commit 6c62350

Browse files
Split up ThrowIfDelayedDeliveryIsDisabledAndMessageIsDelayed for more common cases (#1453)
(cherry picked from commit d96f264) Co-authored-by: danielmarbach <danielmarbach@users.noreply.github.com>
1 parent 05708a4 commit 6c62350

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

src/NServiceBus.Transport.RabbitMQ/Sending/MessageDispatcher.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
using System;
44
using System.Collections.Generic;
5+
using System.Diagnostics.CodeAnalysis;
56
using System.Threading;
67
using System.Threading.Tasks;
78

@@ -77,12 +78,18 @@ Task PublishMessage(MulticastTransportOperation transportOperation, ConfirmsAwar
7778

7879
void ThrowIfDelayedDeliveryIsDisabledAndMessageIsDelayed(IOutgoingTransportOperation transportOperation)
7980
{
80-
if (!supportsDelayedDelivery &&
81-
(transportOperation.Properties.DelayDeliveryWith != null ||
82-
transportOperation.Properties.DoNotDeliverBefore != null))
81+
if (supportsDelayedDelivery)
8382
{
84-
throw new Exception("Delayed delivery has been disabled in the transport settings.");
83+
return;
84+
}
85+
86+
if (transportOperation.Properties.DelayDeliveryWith != null || transportOperation.Properties.DoNotDeliverBefore != null)
87+
{
88+
ThrowDelayedDeliveryDisabled();
8589
}
8690
}
91+
92+
[DoesNotReturn]
93+
static void ThrowDelayedDeliveryDisabled() => throw new Exception("Delayed delivery has been disabled in the transport settings.");
8794
}
8895
}

0 commit comments

Comments
 (0)