diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-09-26 14:12:55 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-26 14:12:55 +0000 |
| commit | a22bf87583396f5720e3eb2c6fe555ca2da9cb89 (patch) | |
| tree | 3afc24e9347693e57f01db2b6fcc2a9142baca66 /cpp/src/IceGrid/InternalRegistryI.cpp | |
| parent | Bug 1379. (diff) | |
| download | ice-a22bf87583396f5720e3eb2c6fe555ca2da9cb89.tar.bz2 ice-a22bf87583396f5720e3eb2c6fe555ca2da9cb89.tar.xz ice-a22bf87583396f5720e3eb2c6fe555ca2da9cb89.zip | |
Fixes to allow upgrade of a slave to a master
Diffstat (limited to 'cpp/src/IceGrid/InternalRegistryI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/InternalRegistryI.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/cpp/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp index 0b2fd6cd504..bdf24718a8f 100644 --- a/cpp/src/IceGrid/InternalRegistryI.cpp +++ b/cpp/src/IceGrid/InternalRegistryI.cpp @@ -158,16 +158,10 @@ NodePrxSeq InternalRegistryI::getNodes(const Ice::Current&) const { NodePrxSeq nodes; - try - { - Ice::ObjectProxySeq proxies = _database->getInternalObjectsByType(Node::ice_staticId()); - for(Ice::ObjectProxySeq::const_iterator p = proxies.begin(); p != proxies.end(); ++p) - { - nodes.push_back(NodePrx::uncheckedCast(*p)); - } - } - catch(const ObjectNotRegisteredException&) + Ice::ObjectProxySeq proxies = _database->getInternalObjectsByType(Node::ice_staticId()); + for(Ice::ObjectProxySeq::const_iterator p = proxies.begin(); p != proxies.end(); ++p) { + nodes.push_back(NodePrx::uncheckedCast(*p)); } return nodes; } @@ -176,16 +170,10 @@ InternalRegistryPrxSeq InternalRegistryI::getReplicas(const Ice::Current&) const { InternalRegistryPrxSeq replicas; - try - { - Ice::ObjectProxySeq proxies = _database->getObjectsByType(InternalRegistry::ice_staticId()); - for(Ice::ObjectProxySeq::const_iterator p = proxies.begin(); p != proxies.end(); ++p) - { - replicas.push_back(InternalRegistryPrx::uncheckedCast(*p)); - } - } - catch(const ObjectNotRegisteredException&) + Ice::ObjectProxySeq proxies = _database->getObjectsByType(InternalRegistry::ice_staticId()); + for(Ice::ObjectProxySeq::const_iterator p = proxies.begin(); p != proxies.end(); ++p) { + replicas.push_back(InternalRegistryPrx::uncheckedCast(*p)); } return replicas; } |