summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2007-09-17 14:08:17 +0000
committerGordon Sim <gsim@apache.org>2007-09-17 14:08:17 +0000
commita10716a968724e94f7a851d7883a39911b69930e (patch)
treeef02cdd445b7806d47cbf1bf9939cfcedc3341cd /qpid/cpp/src
parented3fa3cbbc9a960d701bc1463bab75bd4f426265 (diff)
downloadqpid-python-a10716a968724e94f7a851d7883a39911b69930e.tar.gz
Fix for race between flush and delivery.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@576448 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/Session.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/Session.cpp b/qpid/cpp/src/qpid/broker/Session.cpp
index d3f82655d0..8e8632e922 100644
--- a/qpid/cpp/src/qpid/broker/Session.cpp
+++ b/qpid/cpp/src/qpid/broker/Session.cpp
@@ -535,7 +535,13 @@ void Session::ConsumerImpl::addMessageCredit(uint32_t value)
void Session::ConsumerImpl::flush()
{
+ //need to prevent delivery after requestDispatch returns but
+ //before credit is reduced to zero; TODO: come up with better
+ //implementation of flush.
+ Mutex::ScopedLock l(lock);
queue->requestDispatch(this, true);
+ byteCredit = 0;
+ msgCredit = 0;
}
void Session::ConsumerImpl::stop()