diff options
author | Benoit Foucher <benoit@zeroc.com> | 2008-11-12 11:22:37 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2008-11-12 11:22:37 +0100 |
commit | a000857ff6a9ad91cc1931ce367520f66b9f5a80 (patch) | |
tree | 877505ed78f842594814b6b627323a589ac2675b /cpp/src/Ice/ConnectionFactory.cpp | |
parent | Fixed bug 3537 - Assertion when Ice.ThreadPool.Client thread creation fails (diff) | |
parent | Fixed bug 3539 - SEGFAULT if thread start() fails in constructor (diff) | |
download | ice-a000857ff6a9ad91cc1931ce367520f66b9f5a80.tar.bz2 ice-a000857ff6a9ad91cc1931ce367520f66b9f5a80.tar.xz ice-a000857ff6a9ad91cc1931ce367520f66b9f5a80.zip |
Merge commit 'origin/R3_3_branch'
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
-rw-r--r-- | cpp/src/Ice/ConnectionFactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index c84ff797b7f..23fd5bcb242 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -1495,7 +1495,7 @@ IceInternal::IncomingConnectionFactory::initialize(const string& adapterName) { // Here we ignore any exceptions in close(). } - + _acceptor = 0; throw; } } |