Merge pull request #166 from rabbitmq/rabbitmq-dotnet-client-144

Do not duplicate consumer shutdown event.

Author: michaelklishin

projects/client/RabbitMQ.Client.WinRT/RabbitMQ.Client.WinRT.csproj

@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildProjectDirectory)\..\..\..\Local.props" />
   <!-- MSBuild Community Tasks -->
   <PropertyGroup>
     <MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\..\..\..\lib\MSBuild.Community.Tasks\</MSBuildCommunityTasksPath>
+    <TargetPlatformVersion>8.1</TargetPlatformVersion>
+    <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildCommunityTasksPath)MSBuild.Community.Tasks.Targets" />
   <!-- Gensrc dir -->
@@ -557,11 +559,11 @@
   </Target>
   <!-- Microsoft Windows 8 CSharp targets -->
   <Import Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets')" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
-    <VisualStudioVersion>11.0</VisualStudioVersion>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
+    <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>
   <!-- Custom BeforeBuild-->
   <Target Name="BeforeBuild" DependsOnTargets="GenerateApi; Detokenize" />
   <!-- Custom BeforeClean -->
   <Target Name="BeforeClean" DependsOnTargets="CleanGenerateApi; CleanDetokenize" />
-</Project>
+</Project>

projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

@@ -1181,7 +1181,6 @@ public string BasicConsume(string queue,
             IDictionary<string, object> arguments,
             IBasicConsumer consumer)
         {
-            ModelShutdown += consumer.HandleModelShutdown;
 
             var k = new BasicConsumerRpcContinuation { m_consumer = consumer };
 

projects/client/Unit/src/unit/TestConsumerOperationDispatch.cs

@@ -180,28 +180,38 @@ public void TestChannelShutdownDoesNotShutDownDispatcher()
         private class ShutdownLatchConsumer : DefaultBasicConsumer
         {
             public ManualResetEvent Latch { get; private set; }
+            public ManualResetEvent DuplicateLatch { get; private set; }
 
-            public ShutdownLatchConsumer(ManualResetEvent latch)
+            public ShutdownLatchConsumer(ManualResetEvent latch, ManualResetEvent duplicateLatch)
             {
                 this.Latch = latch;
+                this.DuplicateLatch = duplicateLatch;
             }
 
             public override void HandleModelShutdown(object model, ShutdownEventArgs reason)
             {
-                this.Latch.Set();
+                // keep track of duplicates
+                if (this.Latch.WaitOne(0)){
+                    this.DuplicateLatch.Set();
+                } else {
+                    this.Latch.Set();
+                }
             }
         }
 
         [Test]
         public void TestModelShutdownHandler()
         {
             var latch = new ManualResetEvent(false);
+            var duplicateLatch = new ManualResetEvent(false);
             var q = this.Model.QueueDeclare().QueueName;
-            var c = new ShutdownLatchConsumer(latch);
+            var c = new ShutdownLatchConsumer(latch, duplicateLatch);
 
             this.Model.BasicConsume(queue: q, noAck: true, consumer: c);
             this.Model.Close();
             Wait(latch, TimeSpan.FromSeconds(5));
+            Assert.IsFalse(duplicateLatch.WaitOne(TimeSpan.FromSeconds(5)),
+                           "event handler fired more than once");
         }
     }
 }