diff options
| author | Alan Conway <aconway@apache.org> | 2010-01-06 17:00:57 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-01-06 17:00:57 +0000 |
| commit | 469c2fe3cf3ecd99799074a67adc374381ac4533 (patch) | |
| tree | 09f7cc9356c01625db06c068466804e63b68d7bf /cpp/src/qpid/cluster/Multicaster.cpp | |
| parent | 995e679a76a6f1b48b3d7eeec9b4c2d60b448fb3 (diff) | |
| download | qpid-python-469c2fe3cf3ecd99799074a67adc374381ac4533.tar.gz | |
Don't hold up broker initialization for cluster initialization.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@896536 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Multicaster.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Multicaster.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cpp/src/qpid/cluster/Multicaster.cpp b/cpp/src/qpid/cluster/Multicaster.cpp index 229d7edb1e..4a8195438f 100644 --- a/cpp/src/qpid/cluster/Multicaster.cpp +++ b/cpp/src/qpid/cluster/Multicaster.cpp @@ -55,15 +55,8 @@ void Multicaster::mcastBuffer(const char* data, size_t size, const ConnectionId& void Multicaster::mcast(const Event& e) { { sys::Mutex::ScopedLock l(lock); - if (!ready) { - if (e.isConnection()) holdingQueue.push_back(e); - else { - iovec iov = e.toIovec(); - // FIXME aconway 2009-11-23: configurable retry --cluster-retry - if (!cpg.mcast(&iov, 1)) - throw Exception("CPG flow control error during initialization"); - QPID_LOG(trace, "MCAST (direct) " << e); - } + if (!ready && e.isConnection()) { + holdingQueue.push_back(e); return; } } |
