fix corrupted merge for headermapper

Particular · Aug 15, 2013 · 41a3b8c · 41a3b8c · SimonCropp · Aug 15, 2013
1 parent f158cd9
commit 41a3b8c
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/NServiceBus.Core/Gateway/HeaderManagement/HeaderMapper.cs b/src/NServiceBus.Core/Gateway/HeaderManagement/HeaderMapper.cs
@@ -11,9 +11,7 @@ public static TransportMessage Map(IDictionary<string, string> from)
         {
             if (!from.ContainsKey(GatewayHeaders.IsGatewayMessage))
             {
-                return new TransportMessage();
-            }
-
+                var message = new TransportMessage();
                 foreach (var header in from)
                 {
                     message.Headers[header.Key] = header.Value;
@@ -41,7 +39,6 @@ public static TransportMessage Map(IDictionary<string, string> from)
             {
                 to.TimeToBeReceived = MinimumTimeToBeReceived;
             }
-            }
 
             return to;
         }
@@ -99,7 +96,7 @@ static string StripSlashZeroFromCorrelationId(string corrId)
             return corrId;
         }
 
-        [ObsoleteEx(RemoveInVersion = "5.0", TreatAsErrorFromVersion = "5.0")]
+        [ObsoleteEx(RemoveInVersion = "5.1", TreatAsErrorFromVersion = "5.0")]
         static void SetBackwardsCompatibilityHeaders(IDictionary<string, string> to)
         {
             if (Configure.HasComponent<MsmqMessageSender>())