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/NodeSessionManager.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/NodeSessionManager.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeSessionManager.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp index 718a559f92f..878c0bb03d7 100644 --- a/cpp/src/IceGrid/NodeSessionManager.cpp +++ b/cpp/src/IceGrid/NodeSessionManager.cpp @@ -322,19 +322,29 @@ NodeSessionManager::destroy() NodeSessionMap sessions; { Lock sync(*this); + if(_destroyed) + { + return; + } _destroyed = true; _sessions.swap(sessions); notifyAll(); } - _thread->terminate(); + if(_thread) + { + _thread->terminate(); + } NodeSessionMap::const_iterator p; for(p = sessions.begin(); p != sessions.end(); ++p) { p->second->terminate(); } - _thread->getThreadControl().join(); + if(_thread) + { + _thread->getThreadControl().join(); + } for(p = sessions.begin(); p != sessions.end(); ++p) { p->second->getThreadControl().join(); |