diff options
| author | Alan Conway <aconway@apache.org> | 2012-02-17 14:54:46 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-02-17 14:54:46 +0000 |
| commit | 0a8773c335509c2b9e9b96df360de190a266dcad (patch) | |
| tree | 288469c17dacc37199b5f77498965fee7e778d95 /cpp/src/qpid/cluster/OutputInterceptor.cpp | |
| parent | d82ce6836f7f0e4f7d647b2dc603141f549869d3 (diff) | |
| download | qpid-python-0a8773c335509c2b9e9b96df360de190a266dcad.tar.gz | |
QPID-3603: Merge new HA foundations.
Merged from qpid-3603-7. This is basic support for the new HA approach.
For information & limitations see qpid/cpp/design_docs/new-ha-design.txt.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1245587 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/OutputInterceptor.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/OutputInterceptor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/OutputInterceptor.cpp b/cpp/src/qpid/cluster/OutputInterceptor.cpp index 4bf03eefa2..2cd1cf9a83 100644 --- a/cpp/src/qpid/cluster/OutputInterceptor.cpp +++ b/cpp/src/qpid/cluster/OutputInterceptor.cpp @@ -97,7 +97,7 @@ void OutputInterceptor::deliverDoOutput(uint32_t limit) { } void OutputInterceptor::sendDoOutput(size_t newLimit, const sys::Mutex::ScopedLock&) { - if (parent.isLocal() && !sentDoOutput && !closing) { + if (parent.isLocal() && !sentDoOutput && !closing && parent.isAnnounced()) { sentDoOutput = true; parent.getCluster().getMulticast().mcastControl( ClusterConnectionDeliverDoOutputBody(ProtocolVersion(), newLimit), |