diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-09-10 11:17:10 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-09-10 11:17:10 +0200 |
| commit | bd31f9e6f20658300fe6d118b34f78d269cdf7cb (patch) | |
| tree | 68da37a474db4d4458fc64d9d27c9f9810f01cdd /cpp/src/IceGrid/Topics.cpp | |
| parent | Fixed CHANGES for ICE-5196 (diff) | |
| download | ice-bd31f9e6f20658300fe6d118b34f78d269cdf7cb.tar.bz2 ice-bd31f9e6f20658300fe6d118b34f78d269cdf7cb.tar.xz ice-bd31f9e6f20658300fe6d118b34f78d269cdf7cb.zip | |
Fix for ICE-5417 - IceGrid/replication sporadic failures
Diffstat (limited to 'cpp/src/IceGrid/Topics.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Topics.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp index 24fa297b4de..df24e708af9 100644 --- a/cpp/src/IceGrid/Topics.cpp +++ b/cpp/src/IceGrid/Topics.cpp @@ -977,10 +977,10 @@ ObjectObserverTopic::wellKnownObjectsAddedOrUpdated(const ObjectInfoSeq& infos) { return -1; } - updateSerial(); for(ObjectInfoSeq::const_iterator p = infos.begin(); p != infos.end(); ++p) { + updateSerial(); map<Ice::Identity, ObjectInfo>::iterator q = _objects.find(p->proxy->ice_getIdentity()); if(q != _objects.end()) { @@ -1033,10 +1033,10 @@ ObjectObserverTopic::wellKnownObjectsRemoved(const ObjectInfoSeq& infos) { return -1; } - updateSerial(); for(ObjectInfoSeq::const_iterator p = infos.begin(); p != infos.end(); ++p) { + updateSerial(); _objects.erase(p->proxy->ice_getIdentity()); try { |