Prevent memory leak when churning through many connections

Emile Joubert · Emile Joubert · commit 5d69a0ef0098 · 2010-05-04T12:49:28.000+01:00
diff --git a/.hgignore b/.hgignore
@@ -31,4 +31,7 @@ rabbit\.snk$
 ^build/
 
 ~$
+[Rr]e[Ss]harper
+\.user$
+\.orig$
 
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs
@@ -135,7 +135,8 @@ public ConnectionBase(ConnectionFactory factory,
 
             StartMainLoop();
             Open(insist);
-            StartHeartbeatLoops();
+            StartHeartbeatLoops();
+            AppDomain.CurrentDomain.DomainUnload += HandleDomainUnload;
         }
 
         public event ConnectionShutdownEventHandler ConnectionShutdown
@@ -592,8 +593,6 @@ public void NotifyHeartbeatThread()
 
         public void MainLoop()
         {
-            Thread.GetDomain().DomainUnload += new EventHandler(HandleDomainUnload);
-
             bool shutdownCleanly = false;
             try
             {
@@ -899,7 +898,8 @@ public void OnShutdown()
                         OnCallbackException(args);
                     }
                 }
-            }
+            }
+            AppDomain.CurrentDomain.DomainUnload -= HandleDomainUnload;
         }
 
         public void OnCallbackException(CallbackExceptionEventArgs args)

-Original file line number
+Diff line change
 ^build/
 ~$
 +[Rr]e[Ss]harper
 +\.user$
 +\.orig$
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,8 @@ public ConnectionBase(ConnectionFactory factory,`
`135`	`135`
`136`	`136`	`StartMainLoop();`
`137`	`137`	`Open(insist);`
`138`		`- StartHeartbeatLoops();`
	`138`	`+ StartHeartbeatLoops();`
	`139`	`+ AppDomain.CurrentDomain.DomainUnload += HandleDomainUnload;`
`139`	`140`	`}`
`140`	`141`
`141`	`142`	`public event ConnectionShutdownEventHandler ConnectionShutdown`
`@@ -592,8 +593,6 @@ public void NotifyHeartbeatThread()`
`592`	`593`
`593`	`594`	`public void MainLoop()`
`594`	`595`	`{`
`595`		`- Thread.GetDomain().DomainUnload += new EventHandler(HandleDomainUnload);`
`596`		`-`
`597`	`596`	`bool shutdownCleanly = false;`
`598`	`597`	`try`
`599`	`598`	`{`
`@@ -899,7 +898,8 @@ public void OnShutdown()`
`899`	`898`	`OnCallbackException(args);`
`900`	`899`	`}`
`901`	`900`	`}`
`902`		`- }`
	`901`	`+ }`
	`902`	`+ AppDomain.CurrentDomain.DomainUnload -= HandleDomainUnload;`
`903`	`903`	`}`
`904`	`904`
`905`	`905`	`public void OnCallbackException(CallbackExceptionEventArgs args)`