summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2009-04-28 20:57:58 +0000
committerGordon Sim <gsim@apache.org>2009-04-28 20:57:58 +0000
commit9231b44bd2e7843d4b44f4ef5aac8ae5f6e399af (patch)
treefadc52141e508e34e5b352cf225d5468a5c0545b /qpid/cpp/src
parent9a9447d2c38e22ef4b7a3c280dcfae816003887b (diff)
downloadqpid-python-9231b44bd2e7843d4b44f4ef5aac8ae5f6e399af.tar.gz
Ensure socket is closed when exception occurs during encode/decode.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@769532 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/client/Connector.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/client/Connector.cpp b/qpid/cpp/src/qpid/client/Connector.cpp
index c251233082..fa2c75429f 100644
--- a/qpid/cpp/src/qpid/client/Connector.cpp
+++ b/qpid/cpp/src/qpid/client/Connector.cpp
@@ -391,11 +391,13 @@ void TCPConnector::run() {
aio->start(poller);
d.run();
- socket.close();
} catch (const std::exception& e) {
QPID_LOG(error, QPID_MSG("FAIL " << identifier << ": " << e.what()));
handleClosed();
}
+ try {
+ socket.close();
+ } catch (const std::exception& e) {}
}
void TCPConnector::activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer> sl)