diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-02-11 15:37:23 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-02-12 09:45:06 +0100 |
| commit | f7b2cf35dad61149a95874a50d25cbb6580b75dc (patch) | |
| tree | 860a2537b0a872ca66f0bde601390d03aa286d84 /cpp/src/IceGrid/Activator.cpp | |
| parent | Fixed bug 3712 - bogus del tmp.buf in Make.rules.cs.mak (diff) | |
| download | ice-f7b2cf35dad61149a95874a50d25cbb6580b75dc.tar.bz2 ice-f7b2cf35dad61149a95874a50d25cbb6580b75dc.tar.xz ice-f7b2cf35dad61149a95874a50d25cbb6580b75dc.zip | |
Fixed bug 3722 & 3723 - IceGrid leaks upon start failure
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 0b99b68a417..aad9b15b64f 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -1054,8 +1054,11 @@ Activator::destroy() // when there's no more processes and when _deactivating is set to // true. // - _thread->getThreadControl().join(); - _thread = 0; + if(_thread) + { + _thread->getThreadControl().join(); + _thread = 0; + } assert(_processes.empty()); } |