Fixed Argument Null Exception with unresolved mapping and added logging

FoundatioFx · Jan 4, 2023 · 3e49afb · 3e49afb
1 parent 97159f0
commit 3e49afb
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/Foundatio/Messaging/MessageBusBase.cs b/src/Foundatio/Messaging/MessageBusBase.cs
@@ -141,6 +141,13 @@ protected virtual bool SubscriberHandlesMessage(Subscriber subscriber, IMessage
                 return true;
 
             var clrType = message.ClrType ?? GetMappedMessageType(message.Type);
+            if (clrType is null) {
+                if (_logger.IsEnabled(LogLevel.Warning))
+                    _logger.LogWarning("Unable to resolve CLR type for message body type: ClrType={MessageClrType} Type={MessageType}", message.ClrType, message.Type);
+
+                return false;
+            }
+
             if (subscriber.IsAssignableFrom(clrType))
                 return true;
 
@@ -340,6 +347,9 @@ protected class Subscriber {
             public Func<object, CancellationToken, Task> Action { get; set; }
 
             public bool IsAssignableFrom(Type type) {
+                if (type is null)
+                    return false;
+
                 return _assignableTypesCache.GetOrAdd(type, t => {
                     if (t.IsClass) {
                         var typedMessageType = typeof(IMessage<>).MakeGenericType(t);