.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, 8 insertions, 13 deletions

diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.cpp b/cpp/bindings/qpid/dotnet/src/Receiver.cpp
index 4c9062866d..3c0d79b393 100644
--- a/cpp/bindings/qpid/dotnet/src/Receiver.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Receiver.cpp
@@ -72,14 +72,20 @@ namespace Messaging {
     // Destructor

     Receiver::~Receiver()

     {

-        Cleanup();

+        this->!Receiver();

     }

 

 

     // Finalizer

     Receiver::!Receiver()

     {

-        Cleanup();

+        msclr::lock lk(this);

+

+        if (NULL != receiverp)

+        {

+            delete receiverp;

+            receiverp = NULL;

+        }

     }

 

 

@@ -107,17 +113,6 @@ namespace Messaging {
     }

 

 

-    // Destroys kept object

-    // TODO: add lock

-    void Receiver::Cleanup()

-    {

-        if (NULL != receiverp)

-        {

-            delete receiverp;

-            receiverp = NULL;

-        }

-    }

-

     //

     // Get(message)

     //