From fbd8fe1b7953550a4e03a6fb725ea947cdf18b70 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Tue, 21 Sep 2021 14:49:07 +0200
Subject: [PATCH] Handle NULL message type in Rebus bookmark handler

Fixes #1326
---
 .../Bookmarks/MessageReceivedBookmark.cs           | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/activities/Elsa.Activities.Rebus/Bookmarks/MessageReceivedBookmark.cs b/src/activities/Elsa.Activities.Rebus/Bookmarks/MessageReceivedBookmark.cs
index 6a652c7d6..89b83fc4e 100644
--- a/src/activities/Elsa.Activities.Rebus/Bookmarks/MessageReceivedBookmark.cs
+++ b/src/activities/Elsa.Activities.Rebus/Bookmarks/MessageReceivedBookmark.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Elsa.Services;
@@ -13,13 +14,20 @@ namespace Elsa.Activities.Rebus.Bookmarks
 
     public class MessageReceivedTriggerProvider : BookmarkProvider<MessageReceivedBookmark, RebusMessageReceived>
     {
-        public override async ValueTask<IEnumerable<BookmarkResult>> GetBookmarksAsync(BookmarkProviderContext<RebusMessageReceived> context, CancellationToken cancellationToken) =>
-            new[]
+        public override async ValueTask<IEnumerable<BookmarkResult>> GetBookmarksAsync(BookmarkProviderContext<RebusMessageReceived> context, CancellationToken cancellationToken)
+        {
+            var messageType = await context.ReadActivityPropertyAsync(x => x.MessageType, cancellationToken);
+
+            if (messageType == null)
+                return Enumerable.Empty<BookmarkResult>();
+
+            return new[]
             {
                 Result(new MessageReceivedBookmark
                 {
-                    MessageType = (await context.ReadActivityPropertyAsync(x => x.MessageType, cancellationToken))!.Name
+                    MessageType = messageType.Name
                 })
             };
+        }
     }
 }
\ No newline at end of file