diff options
author | Alan Conway <aconway@apache.org> | 2008-06-06 20:23:28 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2008-06-06 20:23:28 +0000 |
commit | fb1f5c770c551fe526adf5b860dd72cf5eb07311 (patch) | |
tree | 79a0d3ccb278e51b9ec5213b038b903d768c2727 /cpp/src/qpid/client/ConnectionHandler.cpp | |
parent | 76c922baf182bb367feed2ec014e7cab9db7f79d (diff) | |
download | qpid-python-fb1f5c770c551fe526adf5b860dd72cf5eb07311.tar.gz |
Added exceptions to sys::Waitable.
Fixed client side deadlock involving client::Bounds.
Fixed incorrect exception messages during connection shutdown.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@664114 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/client/ConnectionHandler.cpp')
-rw-r--r-- | cpp/src/qpid/client/ConnectionHandler.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/qpid/client/ConnectionHandler.cpp b/cpp/src/qpid/client/ConnectionHandler.cpp index df1afb87a9..05f6bb9733 100644 --- a/cpp/src/qpid/client/ConnectionHandler.cpp +++ b/cpp/src/qpid/client/ConnectionHandler.cpp @@ -83,11 +83,10 @@ void ConnectionHandler::incoming(AMQFrame& frame) void ConnectionHandler::outgoing(AMQFrame& frame) { - if (getState() == OPEN) { + if (getState() == OPEN) out(frame); - } else { - throw Exception("Connection is not open."); - } + else + throw Exception(errorText.empty() ? "Connection is not open." : errorText); } void ConnectionHandler::waitForOpen() |