summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/client/Dispatcher.cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2008-11-03 17:21:38 +0000
committerGordon Sim <gsim@apache.org>2008-11-03 17:21:38 +0000
commita95eb74d7f806e3a60bbd61a042329bcfba9b21d (patch)
tree1f300ecd3d7dd2a39fdcd3882fb788b5dce28bf2 /cpp/src/qpid/client/Dispatcher.cpp
parentc7ed94d2a123f3753a6d64eff5a83b742ce30163 (diff)
downloadqpid-python-a95eb74d7f806e3a60bbd61a042329bcfba9b21d.tar.gz
Various fixes arising from testing client failover:
* introduced new exception type for signalling connection failure (as distinct from any logical connection errors) * ConnectionImpl::closeInternal(): take copy of session map to prevent concurrent modification (by the same thread) as sessions are deleted and erase themselves. * ConnectionImpl::shutdown: hold lock before calling closeInternal(); mark handler failed before informing sessions of failure * SessionImpl::connectionBroker(): remove code as its rather meaningless * Don't swallow exceptions in Dispatcher * Handle exceptions in FailoverListener * Take weak_ptr to ConnectionImpl on constructor of Connector, then convert to shared_ptr when 'receiver' thread is started. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@710106 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/client/Dispatcher.cpp')
-rw-r--r--cpp/src/qpid/client/Dispatcher.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/cpp/src/qpid/client/Dispatcher.cpp
index 0b7618eb4c..da6607fb9e 100644
--- a/cpp/src/qpid/client/Dispatcher.cpp
+++ b/cpp/src/qpid/client/Dispatcher.cpp
@@ -91,9 +91,9 @@ void Dispatcher::run()
if ( failoverHandler ) {
QPID_LOG(debug, QPID_MSG(session.getId() << " failover: " << e.what()));
failoverHandler();
- }
- else {
+ } else {
QPID_LOG(error, session.getId() << " error: " << e.what());
+ throw;
}
}
}