diff options
| author | Alan Conway <aconway@apache.org> | 2011-10-04 14:04:41 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-10-04 14:04:41 +0000 |
| commit | 0206c77b77901f8ddce24bbda6bb66c1cb6bb057 (patch) | |
| tree | 17d256b68c20b0f947d417e74755dfdfbb968685 | |
| parent | 3a0cff06b1e946517544cd150da36b50effcf247 (diff) | |
| download | qpid-python-0206c77b77901f8ddce24bbda6bb66c1cb6bb057.tar.gz | |
QPID-2920: consistent error messages in MessageHandler.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920-active@1178802 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp b/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp index a06756e87b..770b5c0ee3 100644 --- a/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp +++ b/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp @@ -88,7 +88,7 @@ void MessageHandler::enqueue(const std::string& q, uint16_t channel) { // We only need to build message from other brokers, our own messages // are held by the MessageHolder. if (sender() != self()) { - boost::shared_ptr<Queue> queue = findQueue(q, "Cluster enqueue failed"); + boost::shared_ptr<Queue> queue = findQueue(q, "Cluster enqueue"); messageBuilders.announce(sender(), channel, queue); } } @@ -102,7 +102,7 @@ void MessageHandler::acquire(const std::string& q, uint32_t position) { // Note acquires from other members. My own acquires were executed in // the connection thread if (sender() != self()) { - boost::shared_ptr<Queue> queue = findQueue(q, "Cluster acquire failed"); + boost::shared_ptr<Queue> queue = findQueue(q, "Cluster acquire"); QueuedMessage qm; BrokerContext::ScopedSuppressReplication ssr; if (!queue->acquireMessageAt(position, qm)) @@ -128,7 +128,7 @@ void MessageHandler::dequeue(const std::string& q, uint32_t position) { // My own dequeues were processed in the connection thread before multicasting. if (sender() != self()) { - boost::shared_ptr<Queue> queue = findQueue(q, "Cluster dequeue failed"); + boost::shared_ptr<Queue> queue = findQueue(q, "Cluster dequeue"); QueuedMessage qm = QueueContext::get(*queue)->dequeue(position); BrokerContext::ScopedSuppressReplication ssr; if (qm.queue) queue->dequeue(0, qm); @@ -137,7 +137,7 @@ void MessageHandler::dequeue(const std::string& q, uint32_t position) { void MessageHandler::requeue(const std::string& q, uint32_t position, bool redelivered) { if (sender() != self()) { - boost::shared_ptr<Queue> queue = findQueue(q, "Cluster requeue failed"); + boost::shared_ptr<Queue> queue = findQueue(q, "Cluster requeue"); QueueContext::get(*queue)->requeue(position, redelivered); } } |