diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-08-05 21:01:03 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-08-05 21:01:03 +0000 |
| commit | a3b8e6df92d919f7f7aec4f1c54f55da28f9f242 (patch) | |
| tree | 12458748e45e7234905a7db9fa305a7a75d12421 /cpp/src/Ice/Instance.cpp | |
| parent | file IceAtomic.c was initially added on branch R1_1_branch. (diff) | |
| download | ice-a3b8e6df92d919f7f7aec4f1c54f55da28f9f242.tar.bz2 ice-a3b8e6df92d919f7f7aec4f1c54f55da28f9f242.tar.xz ice-a3b8e6df92d919f7f7aec4f1c54f55da28f9f242.zip | |
Merging from 1.1 branch
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 89c7ccd9cb6..baabda38492 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -662,17 +662,11 @@ IceInternal::Instance::destroy() { assert(!_destroyed); - if(_objectAdapterFactory) - { - _objectAdapterFactory->shutdown(); - _objectAdapterFactory->waitForShutdown(); - } - - if(_outgoingConnectionFactory) - { - _outgoingConnectionFactory->destroy(); - _outgoingConnectionFactory->waitUntilFinished(); - } + _objectAdapterFactory->shutdown(); + _outgoingConnectionFactory->destroy(); + + _objectAdapterFactory->waitForShutdown(); + _outgoingConnectionFactory->waitUntilFinished(); ThreadPoolPtr serverThreadPool; ThreadPoolPtr clientThreadPool; |