Merge pull request #544 from Particular/hotfix-5.1.2

Hotfix 5.1.2
Particular · May 9, 2019 · 91c10d6 · 91c10d6
2 parents a4fa1af + 7522bec
commit 91c10d6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/NServiceBus.Transport.RabbitMQ/Sending/MessageDispatcher.cs b/src/NServiceBus.Transport.RabbitMQ/Sending/MessageDispatcher.cs
@@ -34,11 +34,14 @@ public Task Dispatch(TransportOperations outgoingMessages, TransportTransaction
                     tasks.Add(PublishMessage(operation, channel));
                 }
 
+                channelProvider.ReturnPublishChannel(channel);
+
                 return tasks.Count == 1 ? tasks[0] : Task.WhenAll(tasks);
             }
-            finally
+            catch
             {
-                channelProvider.ReturnPublishChannel(channel);
+                channel.Dispose();
+                throw;
             }
         }