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/Database.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/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index 75b9a7eab14..16f5e868aef 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -448,6 +448,7 @@ Database::syncApplicationDescriptor(ObserverSessionI* session, const Application { ServerEntrySeq entries; int serial; + ApplicationUpdateDescriptor update; { Lock sync(*this); checkSessionLock(session); @@ -465,6 +466,7 @@ Database::syncApplicationDescriptor(ObserverSessionI* session, const Application { ApplicationDescriptorHelper helper(_communicator, newDesc); helper.instantiate(); + update = helper.diff(p->second); descriptor = helper.getDescriptor(); } catch(const string& msg) @@ -485,7 +487,7 @@ Database::syncApplicationDescriptor(ObserverSessionI* session, const Application // // Notify the observers. // - _registryObserver->applicationSynced(serial, newDesc); + _registryObserver->applicationUpdated(serial, update); if(_traceLevels->application > 0) { |