diff options
| author | Alan Conway <aconway@apache.org> | 2007-09-24 21:15:46 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-09-24 21:15:46 +0000 |
| commit | b3992a21f76f38797723f70168ecda6be21e3719 (patch) | |
| tree | 9654292603c8b2bc31d5685e8f965b4713352f72 /cpp/src/qpid/broker/Connection.h | |
| parent | 96c24e0cd7359cfb2fb026c742cbd1b2d23a0015 (diff) | |
| download | qpid-python-b3992a21f76f38797723f70168ecda6be21e3719.tar.gz | |
2007-09-24 Alan Conway <aconway@redhat.com>
* cpp/src/qpid/broker/SessionManager.cpp: Manage suspended sessions.
Replaces SuspendedSessions.
* cpp/src/qpid/broker/SessionState.cpp: Work with SessionManager.
* cpp/src/qpid/broker/SessionHandler.cpp: Owns SessionState.
* cpp/src/qpid/broker/Connection.h, .cpp: Owns session handlers.
* cpp/src/qpid/broker/Broker.h: Added SessionManager member.
* cpp/src/Makefile.am: Added broker/SessionManager.cpp
* amqp.0-10-preview.xml: Added session-busy and channel-busy constants.
* cpp/src/tests/.valgrind.supp-default: Added suppresssions for F7.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@578975 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Connection.h')
| -rw-r--r-- | cpp/src/qpid/broker/Connection.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/Connection.h b/cpp/src/qpid/broker/Connection.h index 4f64873dc3..11f5545144 100644 --- a/cpp/src/qpid/broker/Connection.h +++ b/cpp/src/qpid/broker/Connection.h @@ -38,7 +38,7 @@ #include "ConnectionHandler.h" #include "SessionHandler.h" -#include <boost/optional.hpp> +#include <boost/ptr_container/ptr_map.hpp> namespace qpid { namespace broker { @@ -82,9 +82,7 @@ class Connection : public sys::ConnectionInputHandler, void closeChannel(framing::ChannelId channel); private: - - // Use boost::optional to allow default-constructed uninitialized entries in the map. - typedef std::map<framing::ChannelId, boost::optional<SessionHandler> >ChannelMap; + typedef boost::ptr_map<framing::ChannelId, SessionHandler> ChannelMap; typedef std::vector<Queue::shared_ptr>::iterator queue_iterator; framing::ProtocolVersion version; |