Merge branch 'hotfix-1.7.4'

Particular · Nov 9, 2015 · f2f7977 · f2f7977
2 parents 795e772 + e711b48
commit f2f7977
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/src/ServiceControl/Recoverability/Retries/DisableCallbackReceiverForRabbit.cs b/src/ServiceControl/Recoverability/Retries/DisableCallbackReceiverForRabbit.cs
@@ -0,0 +1,27 @@
+namespace ServiceControl.Recoverability.Retries
+{
+    using System;
+    using NServiceBus;
+    using NServiceBus.Configuration.AdvanceExtensibility;
+
+    public class DisableCallbackReceiverForRabbit : INeedInitialization
+    {
+        public void Customize(BusConfiguration configuration)
+        {
+            Type rabbitMqTransportFeature = Type.GetType("NServiceBus.Features.RabbitMqTransportFeature");
+
+            if (rabbitMqTransportFeature != null)
+            {
+                var keyField = rabbitMqTransportFeature.GetField("UseCallbackReceiverSettingKey");
+                if (keyField != null)
+                {
+                    string keyValue = keyField.GetValue(null) as string;
+                    if (keyValue != null)
+                    {
+                        configuration.GetSettings().Set(keyValue, false);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/ServiceControl/ServiceControl.csproj b/src/ServiceControl/ServiceControl.csproj
@@ -449,6 +449,7 @@
     <Compile Include="Recoverability\Grouping\Retries\RetryAllInGroup.cs" />
     <Compile Include="Recoverability\Grouping\Retries\RetryAllInGroupHandler.cs" />
     <Compile Include="Recoverability\Grouping\Groupers\StackTraceParser.cs" />
+    <Compile Include="Recoverability\Retries\DisableCallbackReceiverForRabbit.cs" />
     <Compile Include="Recoverability\Retries\Infrastructure\ReturnToSenderDequeuer.cs" />
     <Compile Include="Recoverability\Retries\FailedMessageRetries.cs" />
     <Compile Include="Recoverability\Retries\MessagesSubmittedForRetry.cs" />

diff --git a/src/Setup/ServiceControl.aip b/src/Setup/ServiceControl.aip
@@ -146,7 +146,7 @@
     <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
-    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="acfab957ce84ba76b9cddcbc7d901ae8983b6536 Subject: NServiceBus Ltd.&#10;Issuer: VeriSign Class 3 Code Signing 2010 CA&#10;Valid from 08/27/2013 to 11/11/2015"/>
+	<ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="be71091fdbc50425ddac13edd5629b0a3b240985 Subject: NServiceBus Ltd.&#10;Issuer: Symantec Class 3 SHA256 Code Signing CA&#10;Valid from 09/22/2015 to 12/22/2017"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
     <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>