diff options
| author | Charles E. Rolke <chug@apache.org> | 2011-12-22 16:51:16 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2011-12-22 16:51:16 +0000 |
| commit | 3b2ada4286577b6bd12090346ebe2aa69073b38f (patch) | |
| tree | 3bde367ea4db9d502f6b8460d7e203be351d22c4 /cpp | |
| parent | 9d7e9fc04fa41b7583097f672f33ed8a089192f2 (diff) | |
| download | qpid-python-3b2ada4286577b6bd12090346ebe2aa69073b38f.tar.gz | |
QPID-3193 Locking .NET Disposed objects - repair patch r1221824
That code initialized the private lock object instead of locking it.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1222343 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/bindings/qpid/dotnet/src/Address.cpp | 2 | ||||
| -rw-r--r-- | cpp/bindings/qpid/dotnet/src/Connection.cpp | 2 | ||||
| -rw-r--r-- | cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp | 2 | ||||
| -rw-r--r-- | cpp/bindings/qpid/dotnet/src/Message.cpp | 2 | ||||
| -rw-r--r-- | cpp/bindings/qpid/dotnet/src/Receiver.cpp | 2 | ||||
| -rw-r--r-- | cpp/bindings/qpid/dotnet/src/Sender.cpp | 2 | ||||
| -rw-r--r-- | cpp/bindings/qpid/dotnet/src/Session.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/cpp/bindings/qpid/dotnet/src/Address.cpp b/cpp/bindings/qpid/dotnet/src/Address.cpp index 67484df1c4..e47db9f925 100644 --- a/cpp/bindings/qpid/dotnet/src/Address.cpp +++ b/cpp/bindings/qpid/dotnet/src/Address.cpp @@ -233,7 +233,7 @@ namespace Messaging { {
if (NULL != nativeObjPtr)
{
- privateLock = gcnew System::Object();
+ msclr::lock lk(privateLock);
if (NULL != nativeObjPtr)
{
diff --git a/cpp/bindings/qpid/dotnet/src/Connection.cpp b/cpp/bindings/qpid/dotnet/src/Connection.cpp index 011c720bdc..9171b5e9fc 100644 --- a/cpp/bindings/qpid/dotnet/src/Connection.cpp +++ b/cpp/bindings/qpid/dotnet/src/Connection.cpp @@ -184,7 +184,7 @@ namespace Messaging { {
if (NULL != nativeObjPtr)
{
- privateLock = gcnew System::Object();
+ msclr::lock lk(privateLock);
if (NULL != nativeObjPtr)
{
diff --git a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp b/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp index 19b55db3f8..4397789f42 100644 --- a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp +++ b/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp @@ -81,7 +81,7 @@ namespace Messaging { {
if (NULL != nativeObjPtr)
{
- privateLock = gcnew System::Object();
+ msclr::lock lk(privateLock);
if (NULL != nativeObjPtr)
{
diff --git a/cpp/bindings/qpid/dotnet/src/Message.cpp b/cpp/bindings/qpid/dotnet/src/Message.cpp index 27cf4e7dba..ca7d796b9e 100644 --- a/cpp/bindings/qpid/dotnet/src/Message.cpp +++ b/cpp/bindings/qpid/dotnet/src/Message.cpp @@ -244,7 +244,7 @@ namespace Messaging { {
if (NULL != nativeObjPtr)
{
- privateLock = gcnew System::Object();
+ msclr::lock lk(privateLock);
if (NULL != nativeObjPtr)
{
diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.cpp b/cpp/bindings/qpid/dotnet/src/Receiver.cpp index 4f96c23511..bbd7dd4c52 100644 --- a/cpp/bindings/qpid/dotnet/src/Receiver.cpp +++ b/cpp/bindings/qpid/dotnet/src/Receiver.cpp @@ -90,7 +90,7 @@ namespace Messaging { {
if (NULL != nativeObjPtr)
{
- privateLock = gcnew System::Object();
+ msclr::lock lk(privateLock);
if (NULL != nativeObjPtr)
{
diff --git a/cpp/bindings/qpid/dotnet/src/Sender.cpp b/cpp/bindings/qpid/dotnet/src/Sender.cpp index 102e6c20b3..4e3502f2fd 100644 --- a/cpp/bindings/qpid/dotnet/src/Sender.cpp +++ b/cpp/bindings/qpid/dotnet/src/Sender.cpp @@ -85,7 +85,7 @@ namespace Messaging { {
if (NULL != nativeObjPtr)
{
- privateLock = gcnew System::Object();
+ msclr::lock lk(privateLock);
if (NULL != nativeObjPtr)
{
diff --git a/cpp/bindings/qpid/dotnet/src/Session.cpp b/cpp/bindings/qpid/dotnet/src/Session.cpp index 929dddf80c..294004b537 100644 --- a/cpp/bindings/qpid/dotnet/src/Session.cpp +++ b/cpp/bindings/qpid/dotnet/src/Session.cpp @@ -90,7 +90,7 @@ namespace Messaging { {
if (NULL != nativeObjPtr)
{
- privateLock = gcnew System::Object();
+ msclr::lock lk(privateLock);
if (NULL != nativeObjPtr)
{
|