diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-03-12 21:54:43 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-03-12 21:54:43 +0100 |
| commit | a8b3a74f68034679eccd00ecd3561729e8195f2d (patch) | |
| tree | 25af949fdbf2046e1ddc976fd03bafd9f5513580 /cpp/src | |
| parent | Bug 3848 - Fix CC patch versions (diff) | |
| download | ice-a8b3a74f68034679eccd00ecd3561729e8195f2d.tar.bz2 ice-a8b3a74f68034679eccd00ecd3561729e8195f2d.tar.xz ice-a8b3a74f68034679eccd00ecd3561729e8195f2d.zip | |
Fixed bug 3839 - ICeGrid/replication test failure, fixed other minor issues
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Database.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index bd3674ea4c8..741462280a7 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -1638,6 +1638,10 @@ Database::finishApplicationUpdate(ServerEntrySeq& entries, throw ex; } } + else + { + for_each(entries.begin(), entries.end(), IceUtil::voidMemFun(&ServerEntry::sync)); + } // // Save the application descriptor. diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index 7bd3afe0e63..5cf227f047e 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -800,7 +800,7 @@ NodeEntry::checkSession() const while(_registering) { - if(!timedWait(IceUtil::Time::seconds(5))) + if(!timedWait(IceUtil::Time::seconds(10))) { break; // Consider the node down if it doesn't respond promptly. } |