QPID-920: send message-accept for acks (as well as completion)

* AckPolicy now maintains a set of transfered messages for cumulative accepts



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@650159 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 10 deletions

diff --git a/cpp/src/qpid/client/Message.cpp b/cpp/src/qpid/client/Message.cpp
index 3d4b9da9fa..58d8fb142a 100644
--- a/cpp/src/qpid/client/Message.cpp
+++ b/cpp/src/qpid/client/Message.cpp
@@ -48,11 +48,6 @@ namespace client {
         return getMessageProperties().getApplicationHeaders(); 
     }
 
-    void Message::acknowledge(bool cumulative, bool notifyPeer) const
-    {
-        const_cast<Session&>(session).getExecution().markCompleted(id, cumulative, notifyPeer);
-    }
-
     const framing::MessageTransferBody& Message::getMethod() const
     {
         return method;
@@ -64,13 +59,10 @@ namespace client {
     }
 
     /**@internal for incoming messages */
-    Message::Message(const framing::FrameSet& frameset, Session s) :
-        method(*frameset.as<framing::MessageTransferBody>()), id(frameset.getId()), session(s)
+    Message::Message(const framing::FrameSet& frameset) :
+        method(*frameset.as<framing::MessageTransferBody>()), id(frameset.getId())
     {
         populate(frameset);
     }
 
-    /**@internal use for incoming messages. */
-    void Message::setSession(Session s) { session=s; }
-
 }}