diff options
author | Gordon Sim <gsim@apache.org> | 2007-11-29 11:54:17 +0000 |
---|---|---|
committer | Gordon Sim <gsim@apache.org> | 2007-11-29 11:54:17 +0000 |
commit | cec3036ee673998e83a2985c4fe6d19ec62c4c13 (patch) | |
tree | f9ec1981be91c6714fcc36d54f8184bfa08513d1 /qpid/cpp/src/qpid/broker/SessionHandler.cpp | |
parent | b277160b329feb28c897a409a13115cb05f18c42 (diff) | |
download | qpid-python-cec3036ee673998e83a2985c4fe6d19ec62c4c13.tar.gz |
Changes to threading: queues serialiser removed, io threads used to drive dispatch to consumers
Fix to PersistableMessage: use correct lock when accessing synclist, don't hold enqueue lock when notifying queues
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@599395 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/broker/SessionHandler.cpp')
-rw-r--r-- | qpid/cpp/src/qpid/broker/SessionHandler.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/qpid/cpp/src/qpid/broker/SessionHandler.cpp b/qpid/cpp/src/qpid/broker/SessionHandler.cpp index a142af2e1a..bbdbccad7d 100644 --- a/qpid/cpp/src/qpid/broker/SessionHandler.cpp +++ b/qpid/cpp/src/qpid/broker/SessionHandler.cpp @@ -70,6 +70,7 @@ void SessionHandler::handleIn(AMQFrame& f) { QPID_MSG("Channel " << channel.get() << " is not open")); } catch(const ChannelException& e) { ignoring=true; // Ignore trailing frames sent by client. + session->detach(); session.reset(); peerSession.closed(e.code, e.what()); }catch(const ConnectionException& e){ @@ -81,14 +82,9 @@ void SessionHandler::handleIn(AMQFrame& f) { } void SessionHandler::handleOut(AMQFrame& f) { - ConditionalScopedLock<Semaphore> s(suspension); - if (s.lockAcquired() && session.get() && session->isAttached()) { - channel.handle(f); // Send it. - if (session->sent(f)) - peerSession.solicitAck(); - } else { - QPID_LOG(error, "Dropping frame as session is no longer attached to a channel: " << f); - } + channel.handle(f); // Send it. + if (session->sent(f)) + peerSession.solicitAck(); } void SessionHandler::assertAttached(const char* method) const { @@ -138,6 +134,7 @@ void SessionHandler::close() { assertAttached("close"); QPID_LOG(info, "Received session.close"); ignoring=false; + session->detach(); session.reset(); peerSession.closed(REPLY_SUCCESS, "ok"); assert(&connection.getChannel(channel.get()) == this); @@ -147,14 +144,15 @@ void SessionHandler::close() { void SessionHandler::closed(uint16_t replyCode, const string& replyText) { QPID_LOG(warning, "Received session.closed: "<<replyCode<<" "<<replyText); ignoring=false; + session->detach(); session.reset(); } void SessionHandler::localSuspend() { - ScopedLock<Semaphore> s(suspension); if (session.get() && session->isAttached()) { session->detach(); connection.broker.getSessionManager().suspend(session); + session.reset(); } } |