diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-12-07 15:31:48 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-12-07 15:31:48 +0000 |
| commit | cbde90b8cc32ec3863c2d78a0ed62e1b986aebe4 (patch) | |
| tree | f60a3e21a1a066f4ded02d6378c0cf9318a14460 /cpp/src/IceGrid/Database.cpp | |
| parent | Replicate TopicManager as well (diff) | |
| download | ice-cbde90b8cc32ec3863c2d78a0ed62e1b986aebe4.tar.bz2 ice-cbde90b8cc32ec3863c2d78a0ed62e1b986aebe4.tar.xz ice-cbde90b8cc32ec3863c2d78a0ed62e1b986aebe4.zip | |
Fixed bug 1603
Diffstat (limited to 'cpp/src/IceGrid/Database.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index b7f26779a04..09e77531310 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -301,7 +301,7 @@ Database::addApplication(const ApplicationInfo& info, AdminSessionI* session) { try { - for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::load)); + for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::syncAndWait)); } catch(const DeploymentException& ex) { @@ -516,14 +516,8 @@ Database::removeApplication(const string& name, AdminSessionI* session) if(_master) { - try - { - for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::load)); - } - catch(const DeploymentException&) - { - // Ignore, this is traced by the node cache. - } + for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::sync)); + for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::waitNoThrow)); } _applicationObserverTopic->waitForSyncedSubscribers(serial); @@ -1468,7 +1462,7 @@ Database::finishApplicationUpdate(ServerEntrySeq& entries, // try { - for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::load)); + for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::syncAndWait)); } catch(const DeploymentException& ex) { @@ -1485,7 +1479,7 @@ Database::finishApplicationUpdate(ServerEntrySeq& entries, try { - for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::load)); + for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::syncAndWait)); } catch(const DeploymentException& ex) { |