summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/cluster/Cluster.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-02-25 22:53:43 +0000
committerAlan Conway <aconway@apache.org>2009-02-25 22:53:43 +0000
commitd626716ccce8244e6b565c3acc176eb69a472cf6 (patch)
treeeb9cc87b76a24a9b40f82ce0c6e13306db06d932 /cpp/src/qpid/cluster/Cluster.cpp
parentd757e87fc81292c173ee98eece3dbd059d06902b (diff)
downloadqpid-python-d626716ccce8244e6b565c3acc176eb69a472cf6.tar.gz
Add FrameDecoder unit test, update comments in Cluster.h/cpp.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747947 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Cluster.cpp')
-rw-r--r--cpp/src/qpid/cluster/Cluster.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index 7285b85991..6b4cd0256c 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -104,12 +104,12 @@ Cluster::Cluster(const ClusterSettings& set, broker::Broker& b) :
boost::bind(&Cluster::leave, this),
"Error delivering frames",
poller),
- connections(*this),
decoder(boost::bind(&PollableFrameQueue::push, &deliverFrameQueue, _1), connections),
expiryPolicy(new ExpiryPolicy(boost::bind(&Cluster::isLeader, this), mcast, myId, broker.getTimer())),
frameId(0),
initialized(false),
state(INIT),
+ connections(*this),
lastSize(0),
lastBroker(false),
sequence(0)
@@ -161,7 +161,7 @@ void Cluster::addShadowConnection(const boost::intrusive_ptr<Connection>& c) {
}
void Cluster::erase(const ConnectionId& id) {
- // Called only by Connection::deliverClose in deliver thread, no need to lock.
+ // Called only by Connection::deliverClose in deliver thread with lock held.
connections.erase(id);
}