diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-09-04 19:23:32 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-09-04 19:23:32 +0000 |
| commit | bdeb0007e50f676bf416ca25c493c888548ea7cd (patch) | |
| tree | f7f25ecd302b273e31d80a420e5667b40900a267 /cpp/src/IcePack/ServerI.cpp | |
| parent | Temporary fix to use binary freeze db (diff) | |
| download | ice-bdeb0007e50f676bf416ca25c493c888548ea7cd.tar.bz2 ice-bdeb0007e50f676bf416ca25c493c888548ea7cd.tar.xz ice-bdeb0007e50f676bf416ca25c493c888548ea7cd.zip | |
Added local exceptions ObjectAdapterActiveException and
ObjectAdapterNotRegisteredException.
:LocatoRegistry::addAdapter method to setAdapterDirectProxy.
Minor IcePack fixes.
Diffstat (limited to 'cpp/src/IcePack/ServerI.cpp')
| -rw-r--r-- | cpp/src/IcePack/ServerI.cpp | 61 |
1 files changed, 36 insertions, 25 deletions
diff --git a/cpp/src/IcePack/ServerI.cpp b/cpp/src/IcePack/ServerI.cpp index 435fcb92ab2..b98b7c9a453 100644 --- a/cpp/src/IcePack/ServerI.cpp +++ b/cpp/src/IcePack/ServerI.cpp @@ -324,32 +324,43 @@ IcePack::ServerI::stopInternal() // manager to shutdown the server. // bool deactivate = true; + + // + // TODO: use the service manager to shutdown icebox servers. The + // following code should work once it's possible to set an + // activation mode on a per adapter basis -- we really don't want + // to activate the icebox in this method if it's already + // deactivated. + // - if(description.serviceManager) - { - try - { - // - // Set a timeout on the service manager proxy and try to - // shutdown the icebox. - // - IceBox::ServiceManagerPrx serviceManager = - IceBox::ServiceManagerPrx::uncheckedCast(description.serviceManager->ice_timeout(_waitTime)); - - serviceManager->shutdown(); - - deactivate = false; - } - catch(const Ice::LocalException& ex) - { - if(_traceLevels->server > 1) - { - Ice::Trace out(_traceLevels->logger, _traceLevels->serverCat); - out << "couldn't contact the IceBox `" << description.name << "' service manager:\n"; - out << ex; - } - } - } +// if(description.serviceManager) +// { +// if(_state == Deactivating) +// { +// try +// { +// // +// // Set a timeout on the service manager proxy and try to +// // shutdown the icebox. +// // +// IceBox::ServiceManagerPrx serviceManager = +// IceBox::ServiceManagerPrx::uncheckedCast(description.serviceManager->ice_timeout(_waitTime)); + +// serviceManager->shutdown(); + +// deactivate = false; +// } +// catch(const Ice::LocalException& ex) +// { +// if(_traceLevels->server > 1) +// { +// Ice::Trace out(_traceLevels->logger, _traceLevels->serverCat); +// out << "couldn't contact the IceBox `" << description.name << "' service manager:\n"; +// out << ex; +// } +// } +// } +// } if(deactivate) { |