summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/management/ManagementAgent.cpp8
-rw-r--r--qpid/cpp/src/qpid/management/ManagementAgent.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index d6a91ab2c1..ee0eb27bf6 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
@@ -119,7 +119,7 @@ void ManagementAgent::RegisterClass (string packageName,
uint8_t* md5Sum,
ManagementObject::writeSchemaCall_t schemaCall)
{
- RWlock::ScopedWlock writeLock (userLock);
+ Mutex::ScopedLock lock (userLock);
PackageMap::iterator pIter = FindOrAddPackage (packageName);
AddClassLocal (pIter, className, md5Sum, schemaCall);
}
@@ -128,7 +128,7 @@ void ManagementAgent::addObject (ManagementObject::shared_ptr object,
uint64_t /*persistenceId*/,
uint64_t /*idOffset*/)
{
- RWlock::ScopedWlock writeLock (userLock);
+ Mutex::ScopedLock lock (userLock);
uint64_t objectId;
// if (persistenceId == 0)
@@ -219,7 +219,7 @@ void ManagementAgent::SendBuffer (Buffer& buf,
void ManagementAgent::PeriodicProcessing (void)
{
#define BUFSIZE 65536
- RWlock::ScopedWlock writeLock (userLock);
+ Mutex::ScopedLock lock (userLock);
char msgChars[BUFSIZE];
uint32_t contentSize;
string routingKey;
@@ -289,7 +289,7 @@ void ManagementAgent::dispatchCommand (Deliverable& deliverable,
const string& routingKey,
const FieldTable* /*args*/)
{
- RWlock::ScopedRlock readLock (userLock);
+ Mutex::ScopedLock lock (userLock);
Message& msg = ((DeliverableMessage&) deliverable).getMessage ();
if (routingKey.compare (0, 13, "agent.method.") == 0)
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.h b/qpid/cpp/src/qpid/management/ManagementAgent.h
index ac665eb50d..bd86d4e773 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.h
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.h
@@ -136,7 +136,7 @@ class ManagementAgent
static bool enabled;
qpid::framing::Uuid uuid;
- qpid::sys::RWlock userLock;
+ qpid::sys::Mutex userLock;
broker::Timer timer;
broker::Exchange::shared_ptr mExchange;
broker::Exchange::shared_ptr dExchange;