diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Connection.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/cluster/OutputInterceptor.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp index 1023e86bae..fae81acf00 100644 --- a/cpp/src/qpid/cluster/Connection.cpp +++ b/cpp/src/qpid/cluster/Connection.cpp @@ -91,7 +91,7 @@ bool Connection::doOutput() { // which stocks up the write buffers with data. // void Connection::deliverDoOutput(uint32_t requested) { - + assert(!catchUp); output.deliverDoOutput(requested); } diff --git a/cpp/src/qpid/cluster/OutputInterceptor.cpp b/cpp/src/qpid/cluster/OutputInterceptor.cpp index 37b5b1a3e6..bdb6dea791 100644 --- a/cpp/src/qpid/cluster/OutputInterceptor.cpp +++ b/cpp/src/qpid/cluster/OutputInterceptor.cpp @@ -76,12 +76,10 @@ void OutputInterceptor::deliverDoOutput(size_t requested) { // Run the real doOutput() till we have added the requested data or there's nothing to output. sent = 0; - { - sys::Mutex::ScopedUnlock u(lock); do { + sys::Mutex::ScopedUnlock u(lock); moreOutput = parent.getBrokerConnection().doOutput(); } while (sent < requested && moreOutput); - } sent += buf; // Include buffered data in the sent total. QPID_LOG(trace, "Delivered doOutput: requested=" << requested << " output=" << sent << " more=" << moreOutput); |