merge bug19190 into default

Author: Matthias Radestock

src/client/impl/ConnectionBase.cs

@@ -650,7 +650,7 @@ public void FinishClose()
             closed = true;
             m_heartbeatRead.Set();
             m_heartbeatWrite.Set();
-        
+
             m_frameHandler.Close();                
             m_model0.SetCloseReason(m_closeReason);
             m_model0.FinishClose();
@@ -684,10 +684,10 @@ public bool HardProtocolExceptionHandler(HardProtocolException hpe)
         ///</remarks>
         public void ClosingLoop()
         {
-            m_frameHandler.Timeout = ConnectionCloseTimeout;
-            DateTime startTimeout = DateTime.Now;
             try
             {
+                m_frameHandler.Timeout = ConnectionCloseTimeout;
+                DateTime startTimeout = DateTime.Now;
                 // Wait for response/socket closure or timeout
                 while (!closed)
                 {
@@ -699,6 +699,11 @@ public void ClosingLoop()
                     MainLoopIteration();
                 }
             }
+            catch (ObjectDisposedException ode)
+            {
+                if (!closed)
+                    LogCloseError("Connection didn't close cleanly", ode);
+            }
             catch (EndOfStreamException eose)
             {
                 if (m_model0.CloseReason == null)