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/QueryI.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/QueryI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/QueryI.cpp | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/cpp/src/IceGrid/QueryI.cpp b/cpp/src/IceGrid/QueryI.cpp index 7df0c437a78..efa395a0c67 100644 --- a/cpp/src/IceGrid/QueryI.cpp +++ b/cpp/src/IceGrid/QueryI.cpp @@ -41,14 +41,7 @@ QueryI::findObjectById_async(const AMD_Query_findObjectByIdPtr& cb, const Ice::I void QueryI::findObjectByType_async(const AMD_Query_findObjectByTypePtr& cb, const string& type, const Ice::Current&) const { - try - { - cb->ice_response(_database->getObjectByType(type)); - } - catch(const ObjectNotRegisteredException&) - { - cb->ice_response(0); - } + cb->ice_response(_database->getObjectByType(type)); } void @@ -57,14 +50,7 @@ QueryI::findObjectByTypeOnLeastLoadedNode_async(const AMD_Query_findObjectByType LoadSample sample, const Ice::Current&) const { - try - { - cb->ice_response(_database->getObjectByTypeOnLeastLoadedNode(type, sample)); - } - catch(const ObjectNotRegisteredException&) - { - cb->ice_response(0); - } + cb->ice_response(_database->getObjectByTypeOnLeastLoadedNode(type, sample)); } void @@ -72,14 +58,7 @@ QueryI::findAllObjectsByType_async(const AMD_Query_findAllObjectsByTypePtr& cb, const string& type, const Ice::Current&) const { - try - { - cb->ice_response(_database->getObjectsByType(type)); - } - catch(const ObjectNotRegisteredException&) - { - cb->ice_response(Ice::ObjectProxySeq()); - } + cb->ice_response(_database->getObjectsByType(type)); } |