You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2011/10/04 16:04:41 UTC
svn commit: r1178802 -
/qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
Author: aconway
Date: Tue Oct 4 14:04:41 2011
New Revision: 1178802
URL: http://svn.apache.org/viewvc?rev=1178802&view=rev
Log:
QPID-2920: consistent error messages in MessageHandler.
Modified:
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
Modified: qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp?rev=1178802&r1=1178801&r2=1178802&view=diff
==============================================================================
--- qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp (original)
+++ qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp Tue Oct 4 14:04:41 2011
@@ -88,7 +88,7 @@ void MessageHandler::enqueue(const std::
// 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::
// 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::
// 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::
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);
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org