1 files changed, 2 insertions, 8 deletions
diff --git a/cpp/bindings/qpid/dotnet/src/Connection.cpp b/cpp/bindings/qpid/dotnet/src/Connection.cpp
index d0c5bc9ac5..69ace7db52 100644
--- a/cpp/bindings/qpid/dotnet/src/Connection.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Connection.cpp
@@ -140,21 +140,15 @@ namespace Messaging {
     // Destructor
     Connection::~Connection()
     {
-        Cleanup();
+        this->!Connection();
     }
 
 
     // Finalizer
     Connection::!Connection()
     {
-        Cleanup();
-    }
-
+        msclr::lock lk(this);
 
-    // Destroys kept object
-    // TODO: add lock
-    void Connection::Cleanup()
-    {
         if (NULL != connectionp)
         {
             delete connectionp;