diff options
author | Alan Conway <aconway@apache.org> | 2011-09-06 21:47:43 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2011-09-06 21:47:43 +0000 |
commit | 0151921a7a9339742c95910b2b37a5183fda9f27 (patch) | |
tree | 51da8e3577c94873ebf19d94c0cc95f447569e94 /qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp | |
parent | 5deaca879f13eeb55fbdf0ca39e232e41294d38e (diff) | |
download | qpid-python-0151921a7a9339742c95910b2b37a5183fda9f27.tar.gz |
QPID-2920: Rebased on trunk, fix up minor conflicts.qpid-2920-1
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920-1@1165889 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp')
-rw-r--r-- | qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp b/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp index 211b7052e5..7e9a1219ae 100644 --- a/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp +++ b/qpid/cpp/src/qpid/cluster/exp/MessageHandler.cpp @@ -85,7 +85,7 @@ void MessageHandler::routed(RoutingId routingId) { } void MessageHandler::acquire(const std::string& q, uint32_t position) { - // Note acquires from other members. My own acquires were exeuted in + // Note acquires from other members. My own acquires were executed in // the connection thread if (sender() != self()) { // FIXME aconway 2010-10-28: need to store acquired messages on QueueContext |