From b0e8f2db7791bf2c08bb25673e44ec8362816cae Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 12 Nov 2010 13:22:31 +0000 Subject: QPID-2940: always request completions from broker on Session::acknowledge(), and always clean up any pending accept records at that time git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1034393 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/client/amqp0_10/SessionImpl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/client') diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp index 1086146b0d..6d98527627 100644 --- a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp +++ b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp @@ -97,7 +97,7 @@ void SessionImpl::acknowledge(bool sync_) //message may be redelivered; i.e. the application cannot delete //any state necessary for preventing reprocessing of the message execute(); - if (sync_) sync(true); + sync(sync_); } void SessionImpl::reject(qpid::messaging::Message& m) @@ -433,6 +433,8 @@ void SessionImpl::syncImpl(bool block) { if (block) session.sync(); else session.flush(); + //cleanup unconfirmed accept records: + incoming.pendingAccept(); } void SessionImpl::commitImpl() -- cgit v1.2.1