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/Activator.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/Activator.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index d585a11eb15..22325bb212d 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -1005,6 +1005,13 @@ Activator::destroy() assert(_processes.empty()); } +bool +Activator::isActive() +{ + IceUtil::Monitor< IceUtil::Mutex>::Lock sync(*this); + return !_deactivating; +} + void Activator::runTerminationListener() { |