Merge branch '3.2.6'

Author: shlomii

default.ps1

@@ -1,7 +1,7 @@
 properties {
 	$ProductVersion = "3.2"
 	$BuildNumber = "0";
-	$PatchVersion = "5"
+	$PatchVersion = "6"
 	$PreRelease = "-build"	
 	$PackageNameSuffix = ""
 	$TargetFramework = "net-4.0"
@@ -770,7 +770,7 @@ task CreatePackages -depends PrepareRelease  -description "After preparing for R
 	#region Packing NServiceBus.NHibernate
 	$packageNameNHibernate = "NServiceBus.NHibernate" + $PackageNameSuffix
 	$packit.package_description = "The NHibernate for the NServicebus"
-	invoke-packit $packageNameNHibernate $script:packageVersion @{"Iesi.Collections"="3.2.0.4000";"NHibernate"="3.2.0.4000"} "binaries\NServiceBus.NHibernate.dll"
+	invoke-packit $packageNameNHibernate $script:packageVersion @{"NHibernate"="3.3.0.4000"} "binaries\NServiceBus.NHibernate.dll"
 	#endregion	
 
 	#region Packing NServiceBus.Azure

src/management/retries/NServiceBus.Management.Retries.Tests/SecondLevelRetriesTests.cs

@@ -34,6 +34,34 @@ public void SetUp()
             _message = new TransportMessage {Headers = new Dictionary<string, string>()};
         }
 
+        [Test]
+        public void Message_should_have_ReplyToAddress_set_to_original_sender_when_sent_to_real_errorq()
+        {
+            var expected = new Address("clientQ", "myMachine");
+            _message.ReplyToAddress = expected;
+            SecondLevelRetries.RetryPolicy = _ => TimeSpan.MinValue;
+
+            _satellite.Handle(_message);
+
+            Assert.AreEqual(expected, _message.ReplyToAddress);
+        }
+
+        [Test]
+        public void Message_should_have_ReplyToAddress_set_to_original_sender_when_sent_to_real_errorq_after_retries()
+        {
+            TransportMessageHelpers.SetHeader(_message, Faults.FaultsHeaderKeys.FailedQ, "reply@address");            
+
+            var expected = new Address("clientQ", "myMachine");
+            _message.ReplyToAddress = expected;
+
+            for (var i = 0; i < DefaultRetryPolicy.NumberOfRetries + 1; i++)
+            {
+                _satellite.Handle(_message);
+            }
+
+            Assert.AreEqual(expected, _message.ReplyToAddress);
+        }
+
         [Test]
         public void Message_should_be_sent_to_real_errorQ_if_defer_timespan_is_less_than_zero()
         {

src/management/retries/NServiceBus.Management.Retries/Helpers/TransportMessageHelpers.cs

@@ -58,5 +58,19 @@ public static int GetNumberOfRetries(TransportMessage message)
             }
             return 0;
         }
+
+        public static Address GetOriginalReplyToAddressAndRemoveItFromHeaders(TransportMessage message)
+        {
+            var originalReplyToAddress = GetHeader(message, SecondLevelRetriesHeaders.OriginalReplyToAddress);
+
+            if (originalReplyToAddress == null)
+            {
+                return message.ReplyToAddress;
+            }
+
+            SetHeader(message, SecondLevelRetriesHeaders.OriginalReplyToAddress, null);
+
+            return Address.Parse(originalReplyToAddress);
+        }
     }
 }

src/management/retries/NServiceBus.Management.Retries/SecondLevelRetries.cs

@@ -56,17 +56,22 @@ void SendToErrorQueue(TransportMessage message)
         {
             Logger.InfoFormat("Send message to error queue, {0}", FaultManager.ErrorQueue);
 
-            message.ReplyToAddress = TransportMessageHelpers.GetReplyToAddress(message);
+            message.ReplyToAddress = TransportMessageHelpers.GetOriginalReplyToAddressAndRemoveItFromHeaders(message);
             MessageSender.Send(message, FaultManager.ErrorQueue);
         }
 
         void Defer(TimeSpan defer, TransportMessage message)
-        {            
-            message.ReplyToAddress = TransportMessageHelpers.GetReplyToAddress(message);
-
+        {
             TransportMessageHelpers.SetHeader(message, Headers.Expire, (DateTime.UtcNow + defer).ToWireFormattedString());
             TransportMessageHelpers.SetHeader(message, SecondLevelRetriesHeaders.Retries, (TransportMessageHelpers.GetNumberOfRetries(message) + 1).ToString());
 
+            if (!TransportMessageHelpers.HeaderExists(message, SecondLevelRetriesHeaders.OriginalReplyToAddress) && message.ReplyToAddress != null)
+            {
+                TransportMessageHelpers.SetHeader(message, SecondLevelRetriesHeaders.OriginalReplyToAddress, message.ReplyToAddress.ToString());
+            }
+
+            message.ReplyToAddress = TransportMessageHelpers.GetReplyToAddress(message);
+
             if (!TransportMessageHelpers.HeaderExists(message, SecondLevelRetriesHeaders.RetriesTimestamp))
             {
                 TransportMessageHelpers.SetHeader(message, SecondLevelRetriesHeaders.RetriesTimestamp, DateTime.UtcNow.ToWireFormattedString());

src/management/retries/NServiceBus.Management.Retries/SecondLevelRetriesHeaders.cs

@@ -2,6 +2,7 @@
 {
     public static class SecondLevelRetriesHeaders
     {
+        public const string OriginalReplyToAddress = "NServiceBus.Retries.OriginalReplyToAddress";
         public const string Retries = "NServiceBus.Retries";
         public const string RetriesTimestamp = "NServiceBus.Retries.Timestamp";
     }