From 602394811fd739bbf02020fa449d07515742ed88 Mon Sep 17 00:00:00 2001
From: "Jeremy D. Miller" <jeremydmiller@yahoo.com>
Date: Thu, 7 Nov 2024 10:53:14 -0600
Subject: [PATCH] Making it more robust to "thaw" out topic routed messages
 from Outbox

---
 .../Internal/RabbitMqSender.cs                 | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Transports/RabbitMQ/Wolverine.RabbitMQ/Internal/RabbitMqSender.cs b/src/Transports/RabbitMQ/Wolverine.RabbitMQ/Internal/RabbitMqSender.cs
index 678b1f4f3..fe40fdc07 100644
--- a/src/Transports/RabbitMQ/Wolverine.RabbitMQ/Internal/RabbitMqSender.cs
+++ b/src/Transports/RabbitMQ/Wolverine.RabbitMQ/Internal/RabbitMqSender.cs
@@ -1,3 +1,4 @@
+using JasperFx.Core;
 using Microsoft.Extensions.Logging;
 using RabbitMQ.Client;
 using Wolverine.Configuration;
@@ -27,7 +28,22 @@ public RabbitMqSender(RabbitMqEndpoint endpoint, RabbitMqTransport transport,
         _exchangeName = new CachedString(endpoint.ExchangeName);
         _key = endpoint.RoutingKey();
 
-        _toRoutingKey = routingType == RoutingMode.Static ? _ => new CachedString(_key) : x => new CachedString(TopicRouting.DetermineTopicName(x));
+        _toRoutingKey = routingType == RoutingMode.Static ? _ => new CachedString(_key) : x =>
+        {
+            if (x.TopicName.IsEmpty() && x.Message == null)
+            {
+                try
+                {
+                    runtime.Pipeline.TryDeserializeEnvelope(x, out var _);
+                }
+                catch (Exception e)
+                {
+                    Logger.LogError(e, "Error trying to deserialize an envelope in order to determine the topic name");
+                }
+            }
+            
+            return new CachedString(TopicRouting.DetermineTopicName(x));
+        };
 
         _mapper = endpoint.BuildMapper(runtime);
         _endpoint = endpoint;