You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2010/11/12 19:19:09 UTC
svn commit: r1034499 - in
/qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid:
client/amqp0_10/SessionImpl.cpp messaging/Session.cpp
Author: gsim
Date: Fri Nov 12 18:19:08 2010
New Revision: 1034499
URL: http://svn.apache.org/viewvc?rev=1034499&view=rev
Log:
QPID-2940: always request completions from broker on Session::acknowledge(), and always clean up any pending accept records at that time
Modified:
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/messaging/Session.cpp
Modified: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp?rev=1034499&r1=1034498&r2=1034499&view=diff
==============================================================================
--- qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp (original)
+++ qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp Fri Nov 12 18:19:08 2010
@@ -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<Acknowledge>();
- 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()
Modified: qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/messaging/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/messaging/Session.cpp?rev=1034499&r1=1034498&r2=1034499&view=diff
==============================================================================
--- qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/messaging/Session.cpp (original)
+++ qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/messaging/Session.cpp Fri Nov 12 18:19:08 2010
@@ -39,7 +39,7 @@ Session& Session::operator=(const Sessio
void Session::commit() { impl->commit(); }
void Session::rollback() { impl->rollback(); }
void Session::acknowledge(bool sync) { impl->acknowledge(sync); }
-void Session::acknowledge(Message& m, bool s) { impl->acknowledge(m); if (s) sync(true); }
+void Session::acknowledge(Message& m, bool s) { impl->acknowledge(m); sync(s); }
void Session::reject(Message& m) { impl->reject(m); }
void Session::release(Message& m) { impl->release(m); }
void Session::close() { impl->close(); }
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org