diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-07-01 09:26:05 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-07-01 09:26:05 +0000 |
| commit | 50c0153ec1b849eb65f28fe14bf15eaf5938af7e (patch) | |
| tree | d00de2b50f8256af6eeb45557d577543b968007f /cpp/src/IceGrid/ServerI.cpp | |
| parent | Changed ant version req to 1.6.1 for deleteonexit (diff) | |
| download | ice-50c0153ec1b849eb65f28fe14bf15eaf5938af7e.tar.bz2 ice-50c0153ec1b849eb65f28fe14bf15eaf5938af7e.tar.xz ice-50c0153ec1b849eb65f28fe14bf15eaf5938af7e.zip | |
Removed applicationSynced call, fixed node observer nodeUp method to not
include inactive servers.
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index d4cb62ab9bf..2fddb91959f 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -579,10 +579,10 @@ ServerI::setStateNoSync(ServerState st, const Ice::Current& current) ServerDynamicInfo info; info.name = _name; info.state = st; + // - // NOTE: this must be done only for the active state. - // Otherwise, we could get a deadlock since getPid() - // will lock the activator and since this method might + // NOTE: this must be done only for the active state. Otherwise, we could get a + // deadlock since getPid() will lock the activator and since this method might // be called from the activator locked. // info.pid = st == Active ? getPid(current) : 0; |