QPID-1052: Patch from Ted Ross

This patch contains the following:

1) The session-id reported by the management API now matches the session.name in the session table
2) management.py API has a new callback for closed connections
3) qpid-tool uses the closed-connection handler to notify the user of a lost connection



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

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index 50938de8ac..2ef1ed2de4 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -45,12 +45,12 @@ using qpid::management::Manageable;
 using qpid::management::Args;
 
 SessionState::SessionState(
-    SessionManager* f, SessionHandler* h, uint32_t timeout_, uint32_t ack) 
+      SessionManager* f, SessionHandler* h, uint32_t timeout_, uint32_t ack, string& _name) 
     : framing::SessionState(ack, timeout_ > 0), nextOut(0),
       factory(f), handler(h), id(true), timeout(timeout_),
       broker(h->getConnection().broker),
       version(h->getConnection().getVersion()),
-      ignoring(false),
+      ignoring(false), name(_name),
       semanticState(*this, *this),
       adapter(semanticState),
       msgBuilder(&broker.getStore(), broker.getStagingThreshold()),
@@ -68,7 +68,7 @@ SessionState::SessionState(
         if (agent.get () != 0)
         {
             mgmtObject = management::Session::shared_ptr
-                (new management::Session (this, parent, id.str ()));
+                (new management::Session (this, parent, name));
             mgmtObject->set_attached (1);
             mgmtObject->set_clientRef (h->getConnection().GetManagementObject()->getObjectId());
             mgmtObject->set_channelId (h->getChannel());