merge bug21817 into default

Author: Emile Joubert

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

@@ -578,6 +578,8 @@ public void NotifyHeartbeatThread()
 
         public void MainLoop()
         {
+            Thread.GetDomain().DomainUnload += new EventHandler(HandleDomainUnload);
+
             bool shutdownCleanly = false;
             try
             {
@@ -682,7 +684,16 @@ public void FinishClose()
             m_model0.SetCloseReason(m_closeReason);
             m_model0.FinishClose();
         }
-            
+
+        /// <remarks>
+        /// We need to close the socket, otherwise attempting to unload the domain
+        /// could cause a CannotUnloadAppDomainException
+        /// </remarks>
+        public void HandleDomainUnload(object sender, EventArgs ea)
+        {
+            Abort(CommonFraming.Constants.InternalError, "Domain Unload");
+        }
+
         public bool HardProtocolExceptionHandler(HardProtocolException hpe)
         {
             if (SetCloseReason(hpe.ShutdownReason))