Updated tracking of outgoing command id and send command-point control on session attachment.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/cpp/src/qpid/broker/SessionHandler.cpp b/cpp/src/qpid/broker/SessionHandler.cpp
index de96ae3f12..919a3e6ee8 100644
--- a/cpp/src/qpid/broker/SessionHandler.cpp
+++ b/cpp/src/qpid/broker/SessionHandler.cpp
@@ -126,6 +126,7 @@ void SessionHandler::attach(const std::string& name, bool /*force*/)
         connection.broker.getSessionManager().open(*this, 0));
     session.reset(state.release());
     peerSession.attached(name);
+    peerSession.commandPoint(session->nextOut, 0);
 }
 
 void SessionHandler::attached(const std::string& /*name*/)
@@ -171,7 +172,7 @@ void SessionHandler::commandPoint(const framing::SequenceNumber& id, uint64_t of
 {
     if (offset) throw NotImplementedException("Non-zero byte offset not yet supported for command-point");
     
-    session->next = id;
+    session->nextIn = id;
 }
 
 void SessionHandler::expected(const framing::SequenceSet& commands, const framing::Array& fragments)
@@ -203,7 +204,7 @@ void SessionHandler::knownCompleted(const framing::SequenceSet& commands)
 void SessionHandler::flush(bool expected, bool confirmed, bool completed)
 {
     if (expected) {
-        peerSession.expected(SequenceSet(session->next), Array());
+        peerSession.expected(SequenceSet(session->nextIn), Array());
     }
     if (confirmed) {
         peerSession.confirmed(session->completed, Array());