diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.cpp | 8 | ||||
| -rw-r--r-- | cpp/test/IceGrid/replication/AllTests.cpp | 6 |
2 files changed, 10 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) { diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index 49027ee1ea6..8bbb30bfafd 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -845,6 +845,12 @@ allTests(const Ice::CommunicatorPtr& comm) try { + // + // On slow environments, it can take a bit for the node to + // re-establish the connection so we ping it twice. The + // second should succeed. + // + slave2Admin->pingNode("Node1"); test(slave2Admin->pingNode("Node1")); // Node should be re-connected even if the master is down. } catch(const NodeNotExistException&) |