1 files changed, 15 insertions, 0 deletions
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
index 800c3269b9..1086146b0d 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
+++ b/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
@@ -112,6 +112,15 @@ void SessionImpl::release(qpid::messaging::Message& m)
     execute1<Release>(m);
 }
 
+void SessionImpl::acknowledge(qpid::messaging::Message& m)
+{
+    //Should probably throw an exception on failure here, or indicate
+    //it through a return type at least. Failure means that the
+    //message may be redelivered; i.e. the application cannot delete
+    //any state necessary for preventing reprocessing of the message
+    execute1<Acknowledge1>(m);
+}
+
 void SessionImpl::close()
 {
     if (hasError()) {
@@ -456,6 +465,12 @@ void SessionImpl::acknowledgeImpl()
     if (!transactional) incoming.accept();
 }
 
+void SessionImpl::acknowledgeImpl(qpid::messaging::Message& m)
+{
+    ScopedLock l(lock);
+    if (!transactional) incoming.accept(MessageImplAccess::get(m).getInternalId());
+}
+
 void SessionImpl::rejectImpl(qpid::messaging::Message& m)
 {
     SequenceSet set;