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/SelectorThread.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/SelectorThread.cpp')
| -rw-r--r-- | cpp/src/Ice/SelectorThread.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/Ice/SelectorThread.cpp b/cpp/src/Ice/SelectorThread.cpp index c76505c240e..4b45bff6c03 100644 --- a/cpp/src/Ice/SelectorThread.cpp +++ b/cpp/src/Ice/SelectorThread.cpp @@ -25,7 +25,6 @@ IceInternal::SelectorThread::SelectorThread(const InstancePtr& instance) : _selector(instance), _timer(_instance->timer()) { - __setNoDelete(true); try { @@ -38,11 +37,17 @@ IceInternal::SelectorThread::SelectorThread(const InstancePtr& instance) : Error out(_instance->initializationData().logger); out << "cannot create thread for selector thread:\n" << ex; } + _thread = 0; __setNoDelete(false); throw; } catch(...) { + { + Error out(_instance->initializationData().logger); + out << "cannot create thread for selector thread"; + } + _thread = 0; __setNoDelete(false); throw; } |