Merge pull request #49 from davecluderay/master

#46 Handle scenarios where correlation ID is present but null
SzymonPobiega · May 24, 2022 · 1c15070 · 1c15070
2 parents 05f52fd + f97bc00
commit 1c15070
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/NServiceBus.Router/Pipeline/Forwarding/ReplyTraceRule.cs b/src/NServiceBus.Router/Pipeline/Forwarding/ReplyTraceRule.cs
@@ -75,7 +75,7 @@ protected void AddTraceHeadersForRoutingBackReply(BaseForwardRuleContext context
             newCorrelationId = newCorrelationId.AppendTLV("reply-to", replyToHeader);
         }
 
-        if (context.ForwardedHeaders.TryGetValue(Headers.CorrelationId, out var correlationId))
+        if (context.ForwardedHeaders.TryGetValue(Headers.CorrelationId, out var correlationId) && correlationId != null)
         {
             newCorrelationId = newCorrelationId.AppendTLV("id", correlationId);
         }
@@ -92,7 +92,7 @@ protected void AddTraceHeadersForRoutingBackReply(BaseForwardRuleContext context
     /// </summary>
     static void UnwrapCorrelationIdAndSetTraceHeader(BaseForwardRuleContext context)
     {
-        if (context.ForwardedHeaders.TryGetValue(Headers.CorrelationId, out var correlationId))
+        if (context.ForwardedHeaders.TryGetValue(Headers.CorrelationId, out var correlationId) && correlationId != null)
         {
             while (true)
             {

diff --git a/src/NServiceBus.Router/Pipeline/Prerouting/ReplyPreroutingTerminator.cs b/src/NServiceBus.Router/Pipeline/Prerouting/ReplyPreroutingTerminator.cs
@@ -22,10 +22,11 @@ static string InterfaceForReply(ReplyPreroutingContext context)
         string destinationIface = null;
 
         if (!context.Headers.TryGetValue(RouterHeaders.ReplyToTrace, out var replyToTrace)
-         && !context.Headers.TryGetValue(Headers.CorrelationId, out replyToTrace))
+            && (!context.Headers.TryGetValue(Headers.CorrelationId, out replyToTrace) || replyToTrace is null))
         {
             throw new UnforwardableMessageException($"The reply has to contain either '{Headers.CorrelationId}' header set by the sending endpoint or '{RouterHeaders.ReplyToTrace}' set by the replying endpoint in order to be routed.");
         }
+
         try
         {
             replyToTrace.DecodeTLV((t, v) =>

diff --git a/src/NServiceBus.Router/TypeLengthValueDecoder.cs b/src/NServiceBus.Router/TypeLengthValueDecoder.cs
@@ -14,6 +14,11 @@ public static string AppendTLV(this string existingTLV, string type, string valu
 
     public static bool TryDecodeTLV(this string tlvString, Action<string, string> valueCallback)
     {
+        if (tlvString is null)
+        {
+            return false;
+        }
+
         var remaining = tlvString;
         while (true)
         {