diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2010-04-15 19:37:20 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2010-04-15 19:37:20 +0000 |
| commit | 233b73fc1586020e645f1ebc4ef380bdefbfc67b (patch) | |
| tree | 88821ac953d6491cc4f75f72d1f1dbbe9cdc2295 /qpid/cpp/src/qpid/management/ManagementAgent.h | |
| parent | a9f00579d155359c3717ae02cdc7481a3487783d (diff) | |
| download | qpid-python-233b73fc1586020e645f1ebc4ef380bdefbfc67b.tar.gz | |
QPID-2507: drop the userLock before calling exchange->route()
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@934561 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/management/ManagementAgent.h')
| -rw-r--r-- | qpid/cpp/src/qpid/management/ManagementAgent.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.h b/qpid/cpp/src/qpid/management/ManagementAgent.h index 0250f39dd6..2366446fe0 100644 --- a/qpid/cpp/src/qpid/management/ManagementAgent.h +++ b/qpid/cpp/src/qpid/management/ManagementAgent.h @@ -301,15 +301,16 @@ private: void deleteObjectNowLH(const ObjectId& oid); void encodeHeader (framing::Buffer& buf, uint8_t opcode, uint32_t seq = 0); bool checkHeader (framing::Buffer& buf, uint8_t *opcode, uint32_t *seq); - void sendBuffer (framing::Buffer& buf, - uint32_t length, - qpid::broker::Exchange::shared_ptr exchange, - std::string routingKey); - void sendBuffer(const std::string& data, - const std::string& cid, - const qpid::types::Variant::Map& headers, - qpid::broker::Exchange::shared_ptr exchange, - const std::string& routingKey); + void sendBufferLH(framing::Buffer& buf, + uint32_t length, + qpid::broker::Exchange::shared_ptr exchange, + std::string routingKey); + void sendBufferLH(const std::string& data, + const std::string& cid, + const qpid::types::Variant::Map& headers, + const std::string& content_type, + qpid::broker::Exchange::shared_ptr exchange, + const std::string& routingKey); void moveNewObjectsLH(); bool authorizeAgentMessageLH(qpid::broker::Message& msg); @@ -330,7 +331,7 @@ private: uint32_t allocateNewBank (); uint32_t assignBankLH (uint32_t requestedPrefix); void deleteOrphanedAgentsLH(); - void sendCommandComplete (std::string replyToKey, uint32_t sequence, + void sendCommandCompleteLH(std::string replyToKey, uint32_t sequence, uint32_t code = 0, std::string text = std::string("OK")); void handleBrokerRequestLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence); void handlePackageQueryLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence); |