svn commit: r1222343 - in /qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src: Address.cpp Connection.cpp FailoverUpdates.cpp Message.cpp Receiver.cpp Sender.cpp Session.cpp

[chug]

Author: chug
Date: Thu Dec 22 16:51:16 2011
New Revision: 1222343

URL: http://svn.apache.org/viewvc?rev=1222343&view=rev
Log:
QPID-3193 Locking .NET Disposed objects - repair patch r1228124

That code initialized the private lock object instead of locking it.

Modified:
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp?rev=1222343&r1=1222342&r2=1222343&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp Thu Dec 22 
16:51:16 2011
@@ -233,7 +233,7 @@ namespace Messaging {
     {
         if (NULL != nativeObjPtr)
         {
-            privateLock = gcnew System::Object();
+            msclr::lock lk(privateLock);
 
             if (NULL != nativeObjPtr)
             {

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp?rev=1222343&r1=1222342&r2=1222343&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp Thu Dec 22 
16:51:16 2011
@@ -184,7 +184,7 @@ namespace Messaging {
     {
         if (NULL != nativeObjPtr)
         {
-            privateLock = gcnew System::Object();
+            msclr::lock lk(privateLock);
 
             if (NULL != nativeObjPtr)
             {

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp?rev=1222343&r1=1222342&r2=1222343&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp Thu Dec 22 
16:51:16 2011
@@ -81,7 +81,7 @@ namespace Messaging {
     {
         if (NULL != nativeObjPtr)
         {
-            privateLock = gcnew System::Object();
+            msclr::lock lk(privateLock);
 
             if (NULL != nativeObjPtr)
             {

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp?rev=1222343&r1=1222342&r2=1222343&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp Thu Dec 22 
16:51:16 2011
@@ -244,7 +244,7 @@ namespace Messaging {
     {
         if (NULL != nativeObjPtr)
         {
-            privateLock = gcnew System::Object();
+            msclr::lock lk(privateLock);
 
             if (NULL != nativeObjPtr)
             {

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp?rev=1222343&r1=1222342&r2=1222343&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp Thu Dec 22 
16:51:16 2011
@@ -90,7 +90,7 @@ namespace Messaging {
     {
         if (NULL != nativeObjPtr)
         {
-            privateLock = gcnew System::Object();
+            msclr::lock lk(privateLock);
 
             if (NULL != nativeObjPtr)
             {

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp?rev=1222343&r1=1222342&r2=1222343&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp Thu Dec 22 16:51:16 
2011
@@ -85,7 +85,7 @@ namespace Messaging {
     {
         if (NULL != nativeObjPtr)
         {
-            privateLock = gcnew System::Object();
+            msclr::lock lk(privateLock);
 
             if (NULL != nativeObjPtr)
             {

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp?rev=1222343&r1=1222342&r2=1222343&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp Thu Dec 22 
16:51:16 2011
@@ -90,7 +90,7 @@ namespace Messaging {
     {
         if (NULL != nativeObjPtr)
         {
-            privateLock = gcnew System::Object();
+            msclr::lock lk(privateLock);
 
             if (NULL != nativeObjPtr)
             {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org