diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-07-06 14:40:47 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-07-06 14:40:47 +0000 |
| commit | e5f2af7fd12093ebae5ac5305f6ec3a43236b7cc (patch) | |
| tree | 7d8d0ac6f16e19ecb09f26c10fa0665185a59c0a /cppe/src | |
| parent | Benoit's change wrt packet size (diff) | |
| download | ice-e5f2af7fd12093ebae5ac5305f6ec3a43236b7cc.tar.bz2 ice-e5f2af7fd12093ebae5ac5305f6ec3a43236b7cc.tar.xz ice-e5f2af7fd12093ebae5ac5305f6ec3a43236b7cc.zip | |
fix shutdown bug. Fix bug with building IceE client side library with
router support enabled.
Diffstat (limited to 'cppe/src')
| -rw-r--r-- | cppe/src/IceE/Instance.cpp | 6 | ||||
| -rwxr-xr-x | cppe/src/IceE/OutgoingConnectionFactory.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp index 0c9dcb8810a..5b54939578a 100644 --- a/cppe/src/IceE/Instance.cpp +++ b/cppe/src/IceE/Instance.cpp @@ -558,6 +558,12 @@ IceInternal::Instance::destroy() { _outgoingConnectionFactory->waitUntilFinished(); } +#else + if(_outgoingConnectionFactory) + { + _outgoingConnectionFactory->destroy(); + _outgoingConnectionFactory->waitUntilFinished(); + } #endif { diff --git a/cppe/src/IceE/OutgoingConnectionFactory.h b/cppe/src/IceE/OutgoingConnectionFactory.h index 2448da694ac..a29d398e829 100755 --- a/cppe/src/IceE/OutgoingConnectionFactory.h +++ b/cppe/src/IceE/OutgoingConnectionFactory.h @@ -15,7 +15,9 @@ #include <IceE/InstanceF.h> #include <IceE/ObjectAdapterF.h> #include <IceE/EndpointF.h> -#include <IceE/RouterF.h> +#ifndef ICEE_NO_ROUTER +# include <IceE/RouterF.h> +#endif #include <IceE/Mutex.h> #include <IceE/Monitor.h> #include <set> |