QPID-4905: Tidy up broker::Connection

- Clean up code for accounting for sent frames
- merged Connection and ConnectionState into Connection

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

1 files changed, 6 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/SessionHandler.cpp b/cpp/src/qpid/broker/SessionHandler.cpp
index 28827ccb9e..8cbecbc6f7 100644
--- a/cpp/src/qpid/broker/SessionHandler.cpp
+++ b/cpp/src/qpid/broker/SessionHandler.cpp
@@ -23,6 +23,7 @@
 #include "qpid/broker/Connection.h"
 #include "qpid/broker/SessionState.h"
 #include "qpid/log/Statement.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
 
 #include <boost/bind.hpp>
 
@@ -63,9 +64,9 @@ void SessionHandler::executionException(
         errorListener->executionException(code, msg);
 }
 
-ConnectionState& SessionHandler::getConnection() { return connection; }
+Connection& SessionHandler::getConnection() { return connection; }
 
-const ConnectionState& SessionHandler::getConnection() const { return connection; }
+const Connection& SessionHandler::getConnection() const { return connection; }
 
 void SessionHandler::handleDetach() {
     qpid::amqp_0_10::SessionHandler::handleDetach();
@@ -80,7 +81,7 @@ void SessionHandler::handleDetach() {
 void SessionHandler::setState(const std::string& name, bool force) {
     assert(!session.get());
     SessionId id(connection.getUserId(), name);
-    session = connection.broker.getSessionManager().attach(*this, id, force);
+    session = connection.getBroker().getSessionManager().attach(*this, id, force);
 }
 
 void SessionHandler::detaching()
@@ -102,7 +103,7 @@ void SessionHandler::readyToSend() {
 void SessionHandler::attachAs(const std::string& name)
 {
     SessionId id(connection.getUserId(), name);
-    SessionState::Configuration config = connection.broker.getSessionManager().getSessionConfig();
+    SessionState::Configuration config = connection.getBroker().getSessionManager().getSessionConfig();
     session.reset(new SessionState(connection.getBroker(), *this, id, config));
     sendAttach(false);
 }
@@ -118,7 +119,7 @@ void SessionHandler::attached(const std::string& name)
         qpid::amqp_0_10::SessionHandler::attached(name);
     } else {
         SessionId id(connection.getUserId(), name);
-        SessionState::Configuration config = connection.broker.getSessionManager().getSessionConfig();
+        SessionState::Configuration config = connection.getBroker().getSessionManager().getSessionConfig();
         session.reset(new SessionState(connection.getBroker(), *this, id, config));
         markReadyToSend();
     }