* Summary:

	 - Moved BrokerChannel functionality into Session.
	 - Moved ChannelHandler methods handling into SessionAdapter.
	 - Updated all handlers to use session.
	 (We're still using AMQP channel methods in SessionAdapter)

	 Roles & responsibilities:

	 Session:
	   - represents an _open_ session, may be active or suspended.
	   - ows all session state including handler chains.
	   - attahced to SessionAdapter when active, not when suspended.
	 
	 SessionAdapter:
	  - reprents the association of a channel with a session.
	  - owned by Connection, kept in the session map.
	  - channel open == SessionAdapter.getSessio() != 0

	 Anything that depends on attachment to a channel, connection or
	 protocol should be in SessionAdpater. Anything that suvives a
	 session suspend belongs in Session.


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

1 files changed, 1 insertions, 4 deletions

diff --git a/cpp/src/qpid/framing/ChannelAdapter.h b/cpp/src/qpid/framing/ChannelAdapter.h
index 82f7115001..55fd08da9d 100644
--- a/cpp/src/qpid/framing/ChannelAdapter.h
+++ b/cpp/src/qpid/framing/ChannelAdapter.h
@@ -29,13 +29,10 @@
 #include "ProtocolVersion.h"
 #include "amqp_types.h"
 #include "FrameHandler.h"
-#include "OutputHandler.h"
 
 namespace qpid {
 namespace framing {
 
-class OutputHandler;
-
 /**
  * Base class for client and broker channels.
  *
@@ -59,7 +56,7 @@ class ChannelAdapter : protected BodyHandler {
     virtual ~ChannelAdapter() {}
 
     /** Initialize the channel adapter. */
-    void init(ChannelId, OutputHandler&, ProtocolVersion);
+    void init(ChannelId, FrameHandler&, ProtocolVersion);
 
     FrameHandler::Chains& getHandlers() { return handlers; }