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 | ddf887b3975a39e77093a872226aabb9ecf20780 (patch) | |
| tree | d3df59cfce98926a42781dd29bfa86544da93928 /qpid/cpp | |
| parent | ea80ff8b1ed5e448b56b69c513195017c18f1808 (diff) | |
| download | qpid-python-ddf887b3975a39e77093a872226aabb9ecf20780.tar.gz | |
QPID-3193 Locking .NET Disposed objects - repair patch r1228124
That code initialized the private lock object instead of locking it.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1222343 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/bindings/qpid/dotnet/src/Address.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qpid/dotnet/src/Message.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qpid/dotnet/src/Session.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp index 67484df1c4..e47db9f925 100644 --- a/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp +++ b/qpid/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/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp index 011c720bdc..9171b5e9fc 100644 --- a/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp +++ b/qpid/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/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp index 19b55db3f8..4397789f42 100644 --- a/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp +++ b/qpid/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/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp index 27cf4e7dba..ca7d796b9e 100644 --- a/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp +++ b/qpid/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/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp index 4f96c23511..bbd7dd4c52 100644 --- a/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp +++ b/qpid/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/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp index 102e6c20b3..4e3502f2fd 100644 --- a/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp +++ b/qpid/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/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp index 929dddf80c..294004b537 100644 --- a/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp +++ b/qpid/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)
{
|