From 7c195327b878b579c3fc585d76aa41599ff05c5b Mon Sep 17 00:00:00 2001
From: Onur Can Cakmak <onur@auction123.com>
Date: Mon, 12 Dec 2011 12:33:18 -0500
Subject: [PATCH] Handle ObjectDisposedException in
 SocketFrameHandler_0_9.Close()

---
 .../src/client/impl/SocketFrameHandler_0_9.cs        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs b/projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs
index 606883d31a..f698d22363 100644
--- a/projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs
+++ b/projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs
@@ -150,8 +150,16 @@ public void WriteFrame(Frame frame)
 
         public void Close()
         {
-            m_socket.LingerState = new LingerOption(true, SOCKET_CLOSING_TIMEOUT);
-            m_socket.Close();
+            try
+            {
+                m_socket.LingerState = new LingerOption(true, SOCKET_CLOSING_TIMEOUT);
+                m_socket.Close();
+            }
+            catch (ObjectDisposedException)
+            {
+                // Ignore the exception if the socket is already closed/disposed
+                return;
+            }
         }
     }
 }