diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-10-23 18:13:24 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-10-23 18:13:24 +0200 |
| commit | ad3522c882b1e2b889ac2a2c60e189e9f89f3b80 (patch) | |
| tree | 2960cc1f1b4741ba864393eb02046b6834db05e5 /cpp/src/IceGrid/ServerI.cpp | |
| parent | Forgot to commit one file for previous fix (diff) | |
| download | ice-ad3522c882b1e2b889ac2a2c60e189e9f89f3b80.tar.bz2 ice-ad3522c882b1e2b889ac2a2c60e189e9f89f3b80.tar.xz ice-ad3522c882b1e2b889ac2a2c60e189e9f89f3b80.zip | |
Fixed locator implementation to not serialize anymore locator request for non round-robin replica groups also fixed an issue where the registry would try to re-activate servers while the node is shutting down
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 9879fc99ca7..2e0910420e2 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -914,7 +914,8 @@ ServerI::isAdapterActivatable(const string& id) const } else if(_state < Destroying) { - return true; // The server is being deactivated. + return _node->getActivator()->isActive(); // The server is being deactivated and the + // node isn't shutting down yet. } else { |