* src/qpid/broker/Session.h, .cpp: Session holds all state of a session including

	handlers created for that session. Session is not directly associated with a channel.
	* src/qpid/broker/SessionAdapter.h, .cpp: SessionAdapter is bound to a channel
	managed by the Connection. It can be attached to and detatched from a Session.
	* src/qpid/broker/Connection.cpp, .h:  Use SessionAdapter.
	
	* src/qpid/framing/Handler.h: Removed use of shared_ptr. Handlers belong
	either to a Session or a Connection and are destroyed with it.
	* src/qpid/framing/InputHandler.h, OutputHandler.h: Both now inherit from
	FrameHandler and can be used as FrameHandlers. Intermediate step to removing
	them entirely.

	* src/qpid/broker/ConnectionAdapter.h:
	* src/qpid/client/ConnectionHandler.h:
	* src/qpid/framing/ChannelAdapter.cpp, .h:
	  Minor changes required by Handler changes.


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

1 files changed, 3 insertions, 6 deletions

diff --git a/cpp/src/qpid/broker/MessageDelivery.cpp b/cpp/src/qpid/broker/MessageDelivery.cpp
index 09ab8ec465..b259aa6b8f 100644
--- a/cpp/src/qpid/broker/MessageDelivery.cpp
+++ b/cpp/src/qpid/broker/MessageDelivery.cpp
@@ -131,10 +131,7 @@ void MessageDelivery::deliver(Message::shared_ptr msg,
     boost::shared_ptr<BaseToken> t = dynamic_pointer_cast<BaseToken>(token);
     t->sendMethod(msg, channel, id);
 
-    boost::shared_ptr<FrameHandler> handler = channel.getHandlers().out;
-    //send header
-    msg->sendHeader(*handler, channel.getId(), framesize);
-
-    //send content    
-    msg->sendContent(*handler, channel.getId(), framesize);
+    FrameHandler& handler = channel.getHandlers().out;
+    msg->sendHeader(handler, channel.getId(), framesize);
+    msg->sendContent(handler, channel.getId(), framesize);
 }