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.cpp | |
| 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.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Connection.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp index b1b8abe4fd..a21db0f603 100644 --- a/cpp/src/qpid/broker/Connection.cpp +++ b/cpp/src/qpid/broker/Connection.cpp @@ -94,13 +94,12 @@ void Connection::closeChannel(uint16_t id) { } SessionHandler& Connection::getChannel(ChannelId id) { - boost::optional<SessionHandler>& ch = channels[id]; - if (!ch) { - ch = boost::in_place(boost::ref(*this), id); + ChannelMap::iterator i=channels.find(id); + if (i == channels.end()) { + i = channels.insert(id, new SessionHandler(*this, id)).first; } - return *ch; + return *i; } - }} |