diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-01-30 16:51:24 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-01-30 16:51:24 +0100 |
| commit | 6f99bac58a16e55487b98ddb5d6f837574c55b02 (patch) | |
| tree | 20db5f71eeee5c7eb0796aed44a150206dff14b0 /cpp/src/IceGrid/ServerI.cpp | |
| parent | ICE-4775 - memory leak in Glacier2 (diff) | |
| download | ice-6f99bac58a16e55487b98ddb5d6f837574c55b02.tar.bz2 ice-6f99bac58a16e55487b98ddb5d6f837574c55b02.tar.xz ice-6f99bac58a16e55487b98ddb5d6f837574c55b02.zip | |
Fixed ICE-4772, IceGrid server disable patch for Cengage
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rwxr-xr-x | cpp/src/IceGrid/ServerI.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 4b9f758f78b..965bb914742 100755 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -790,6 +790,7 @@ void ServerI::setEnabled(bool enabled, const ::Ice::Current&) { bool activate = false; + ServerAdapterDict adpts; { Lock sync(*this); checkDestroyed(); @@ -816,9 +817,15 @@ ServerI::setEnabled(bool enabled, const ::Ice::Current&) return; // Nothing to change! } + adpts = _adapters; _node->observerUpdateServer(getDynamicInfo()); } + for(ServerAdapterDict::iterator r = adpts.begin(); r != adpts.end(); ++r) + { + r->second->updateEnabled(); + } + if(activate) { try @@ -1896,7 +1903,8 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor) if(!servant) { AdapterPrx proxy = AdapterPrx::uncheckedCast(adapter->createProxy(id)); - servant = new ServerAdapterI(_node, this, _id, proxy, (*r)->id); + servant = new ServerAdapterI(_node, this, _id, proxy, (*r)->id, _activation != Disabled || + _failureTime != IceUtil::Time()); adapter->add(servant, id); } _adapters.insert(make_pair((*r)->id, servant)); |