Running the gateway sample using SqlTransport & NHGatewayPersister ca…

…uses exceptions, #SB-194 fixed
Particular · Jul 10, 2013 · 246305e · 246305e
1 parent 9bb4515
commit 246305e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/NServiceBus.Core/Gateway/HeaderManagement/HeaderMapper.cs b/src/NServiceBus.Core/Gateway/HeaderManagement/HeaderMapper.cs
@@ -54,7 +54,7 @@ public static void Map(TransportMessage from, IDictionary<string,string> to)
             to[NServiceBus + TimeToBeReceived] = from.TimeToBeReceived.ToString();
             to[NServiceBus + ReplyToAddress] = from.ReplyToAddress.ToString();
 
-            SetBackwardsCompatibilityHeaders(from, to);
+            SetBackwardsCompatibilityHeaders(to);
 
             if (from.Headers.ContainsKey(ReplyToAddress))
                 to[Headers.RouteTo] = from.Headers[ReplyToAddress];
@@ -64,9 +64,12 @@ public static void Map(TransportMessage from, IDictionary<string,string> to)
         }
 
         [ObsoleteEx(RemoveInVersion = "5.0", TreatAsErrorFromVersion = "5.0")]
-        static void SetBackwardsCompatibilityHeaders(TransportMessage from, IDictionary<string, string> to)
+        static void SetBackwardsCompatibilityHeaders(IDictionary<string, string> to)
         {
-            to[NServiceBus + IdForCorrelation] = from.Headers[CorrIdHeader];
+            if (Configure.HasComponent<MsmqMessageSender>())
+            {
+                to[NServiceBus + IdForCorrelation] = to[NServiceBus + CorrelationId];
+            }
         }
 
         [ObsoleteEx(Message = "No need for this in v5", RemoveInVersion = "5.0", TreatAsErrorFromVersion = "5.0")]