Set MessageId only if ServiceBusMessage doesn't have one

4 years ago · 706d05e888
1 changed files with 6 additions and 3 deletions
--- a/framework/src/Volo.Abp.EventBus.Azure/Volo/Abp/EventBus/Azure/AzureDistributedEventBus.cs
+++ b/framework/src/Volo.Abp.EventBus.Azure/Volo/Abp/EventBus/Azure/AzureDistributedEventBus.cs
@ -108,9 +108,12 @@ public class AzureDistributedEventBus : DistributedEventBusBase, ISingletonDepen

        foreach (var outgoingEvent in outgoingEventArray)
        {
-            var message = new ServiceBusMessage(outgoingEvent.EventData) {
-                MessageId = outgoingEvent.Id.ToString(), Subject = outgoingEvent.EventName
-            };
+            var message = new ServiceBusMessage(outgoingEvent.EventData) { Subject = outgoingEvent.EventName };
+
+            if (message.MessageId.IsNullOrWhiteSpace())
+            {
+                message.MessageId = outgoingEvent.Id.ToString();
+            }

            if (!messageBatch.TryAddMessage(message))
            {