diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-17 15:59:17 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-17 15:59:17 +0100 |
| commit | 92b69ebae7a0f0b01eaddefb6dfd2cce308cfb7c (patch) | |
| tree | 7db682c2fb4accaf31f2c63f9c2d0849be0fa137 /cpp/src | |
| parent | Fixed ICE-6195 - Util.py fix, added library path for env for interpreters (diff) | |
| download | ice-92b69ebae7a0f0b01eaddefb6dfd2cce308cfb7c.tar.bz2 ice-92b69ebae7a0f0b01eaddefb6dfd2cce308cfb7c.tar.xz ice-92b69ebae7a0f0b01eaddefb6dfd2cce308cfb7c.zip | |
Fixed ICE-6068 - test/IceGrid/replication failure
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 5d3a73e24a7..5aa9a592062 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -1469,12 +1469,12 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry, const N break; } } - ObjectInfoSeq infos; + ObjectInfoSeq infos; if(registry) { try { - infos.push_back(_database->getObjectInfo(registry->ice_getIdentity())); + infos.push_back(_database->getObjectInfo(registry->ice_getIdentity())); } catch(const ObjectNotRegisteredException&) { @@ -1482,12 +1482,12 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry, const N } try { - infos.push_back(_database->getObjectInfo(replica->ice_getIdentity())); + infos.push_back(_database->getObjectInfo(replica->ice_getIdentity())); } catch(const ObjectNotRegisteredException&) { } - _database->removeRegistryWellKnownObjects(infos); + _database->removeRegistryWellKnownObjects(infos); if(_traceLevels && _traceLevels->replica > 1) { |