.NET Binding for Qpid Messaging, in every .NET object that keeps

a reference to unmanaged memory:
* Function Cleanup() is deleted and cleanup is moved to Finalizer.
* Destructor calls Finalizer.
* Finalizer takes a lock before deleting unmanaged memory.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1057350 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 8 deletions

diff --git a/cpp/bindings/qpid/dotnet/src/Address.cpp b/cpp/bindings/qpid/dotnet/src/Address.cpp
index b78eb8243e..b688d973ed 100644
--- a/cpp/bindings/qpid/dotnet/src/Address.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Address.cpp
@@ -187,21 +187,15 @@ namespace Messaging {
     // Destructor

     Address::~Address()

     {

-        Cleanup();

+        this->!Address();

     }

 

 

     // Finalizer

     Address::!Address()

     {

-        Cleanup();

-    }

-

+        msclr::lock lk(this);

 

-    // Destroys kept object

-    // TODO: add lock

-    void Address::Cleanup()

-    {

         if (NULL != addressp)

         {

             delete addressp;