.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/FailoverUpdates.cpp b/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
index a931e2d670..d34474f2c4 100644
--- a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
+++ b/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
@@ -64,21 +64,15 @@ namespace Messaging {
     // Destructor

     FailoverUpdates::~FailoverUpdates()

     {

-        Cleanup();

+        this->!FailoverUpdates();

     }

 

 

     // Finalizer

     FailoverUpdates::!FailoverUpdates()

     {

-        Cleanup();

-    }

-

+        msclr::lock lk(this);

 

-    // Destroys kept object

-    // TODO: add lock

-    void FailoverUpdates::Cleanup()

-    {

         if (NULL != failoverupdatesp)

         {

             delete failoverupdatesp;