diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-02-12 09:50:25 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-02-12 09:50:25 -0330 |
| commit | d6a276ee2646f92231c3d8b77af8742fbd921bd2 (patch) | |
| tree | 0826c3e43406de9e0377c43fb01edbbce51fa202 /cpp/src/IceGrid/Activator.cpp | |
| parent | Bug 3651 - slice2cpp --depend does not error on bad slice (diff) | |
| parent | Ensure that no more fds error message is flushed before the abort (diff) | |
| download | ice-d6a276ee2646f92231c3d8b77af8742fbd921bd2.tar.bz2 ice-d6a276ee2646f92231c3d8b77af8742fbd921bd2.tar.xz ice-d6a276ee2646f92231c3d8b77af8742fbd921bd2.zip | |
Merge branch 'R3_3_branch' of ssh://cvs.zeroc.com/home/git/ice into R3_3_branch
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()); } |