diff options
| author | Alan Conway <aconway@apache.org> | 2010-03-12 20:11:31 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-03-12 20:11:31 +0000 |
| commit | ef9268528d3147173dfb0d2ef707ee3e4fc4f210 (patch) | |
| tree | 4d8a9851683812bd04392f57c695a5143c80ca79 /cpp/src/qpid/broker/IncompleteMessageList.cpp | |
| parent | 937fe6e7295efff28cb680642fca28ebf65e7d4e (diff) | |
| download | qpid-python-ef9268528d3147173dfb0d2ef707ee3e4fc4f210.tar.gz | |
New cluster member pushes store when joining an active cluster.
Previously a broker with a clean store would not be able to join an
active cluster because the shtudown-id did not match. This commit
ensures that when a broker joins an active cluster, it always pushes
its store regardless of status. Clean/dirty status is only compared
when forming an initial cluster.
This change required splitting initialization into two phases:
PRE_INIT: occurs in the Cluster ctor during early-initialize. This
phase determines whether or not to push the store.
INIT: occurs after Cluster::initialize and does the remaining
initialization chores.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@922412 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/IncompleteMessageList.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/IncompleteMessageList.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/IncompleteMessageList.cpp b/cpp/src/qpid/broker/IncompleteMessageList.cpp index a061e872d0..34d92fa752 100644 --- a/cpp/src/qpid/broker/IncompleteMessageList.cpp +++ b/cpp/src/qpid/broker/IncompleteMessageList.cpp @@ -79,7 +79,7 @@ void IncompleteMessageList::each(const CompletionListener& listen) { sys::Mutex::ScopedLock l(lock); snapshot = incomplete; } - std::for_each(incomplete.begin(), incomplete.end(), listen); // FIXME aconway 2008-11-07: passed by ref or value? + std::for_each(incomplete.begin(), incomplete.end(), listen); } }} |