Merge branch 'hotfix-2.0.2'

Particular · Oct 31, 2014 · 83e99ec · 83e99ec
2 parents 125ccbb + be1f452
commit 83e99ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/NServiceBus.RabbitMQ/ConfirmsAwareChannel.cs b/src/NServiceBus.RabbitMQ/ConfirmsAwareChannel.cs
@@ -8,7 +8,7 @@ namespace NServiceBus.Transports.RabbitMQ
     using Unicast.Queuing;
 
     [SkipWeaving]
-    class ConfirmsAwareChannel:IDisposable
+    class ConfirmsAwareChannel : IDisposable
     {
         public IModel Channel { get; private set; }
 
@@ -26,14 +26,14 @@ public ConfirmsAwareChannel(IConnection connection, bool usePublisherConfirms, T
 
         public void Dispose()
         {
-            if (!usePublisherConfirms)
-            {
-                return;
-            }
-
             try
             {
-                Channel.WaitForConfirmsOrDie(maxWaitTimeForConfirms);
+                if (usePublisherConfirms)
+                {
+                    Channel.WaitForConfirmsOrDie(maxWaitTimeForConfirms);
+                }
+
+                Channel.Dispose();
             }
             catch (AlreadyClosedException ex)
             {
@@ -44,6 +44,7 @@ public void Dispose()
                     var exchangeName = matches.Count > 0 && matches[0].Groups.Count > 1 ? Address.Parse(matches[0].Groups[1].Value) : null;
                     throw new QueueNotFoundException(exchangeName, "Exchange for the recipient does not exist", ex);
                 }
+
                 throw;
             }
         }

diff --git a/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj b/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj
@@ -117,9 +117,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\packaging\nuget\NServiceBus.Transports.RabbitMQ.nuspec">
-      <Link>NServiceBus.Transports.RabbitMQ.nuspec</Link>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />