Merge pull request #110 from rabbitmq/rabbitmq-dotnet-client-109

michaelklishin · michaelklishin · commit ce2f19198f49 · 2015-07-08T16:57:18.000+03:00
Don't leak recorded channels when automatic recovery is used
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs b/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs
@@ -659,7 +659,13 @@ public void HandleConnectionUnblocked()
 
         void IDisposable.Dispose()
         {
-            Abort();
+            try {
+                Abort();
+            }
+            finally
+            {
+                m_models.Clear();
+            }
             if (ShutdownReport.Count > 0)
             {
                 foreach (ShutdownReportEntry entry in ShutdownReport)
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringModel.cs b/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringModel.cs
@@ -372,7 +372,7 @@ public override string ToString()
 
         void IDisposable.Dispose()
         {
-            m_delegate.Close();
+            Abort();
         }
 
         public void ConnectionTuneOk(ushort channelMax,

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,13 @@ public void HandleConnectionUnblocked()`
`659`	`659`
`660`	`660`	`void IDisposable.Dispose()`
`661`	`661`	`{`
`662`		`- Abort();`
	`662`	`+ try {`
	`663`	`+ Abort();`
	`664`	`+ }`
	`665`	`+ finally`
	`666`	`+ {`
	`667`	`+ m_models.Clear();`
	`668`	`+ }`
`663`	`669`	`if (ShutdownReport.Count > 0)`
`664`	`670`	`{`
`665`	`671`	`foreach (ShutdownReportEntry entry in ShutdownReport)`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ public override string ToString()`
`372`	`372`
`373`	`373`	`void IDisposable.Dispose()`
`374`	`374`	`{`
`375`		`- m_delegate.Close();`
	`375`	`+ Abort();`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`public void ConnectionTuneOk(ushort channelMax,`