diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:04:11 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:04:11 +0000 |
| commit | c979767a00db4ea1299af482033a68829cc16675 (patch) | |
| tree | 3e959cad0a053f1adad663e7c02bc7a239f383d8 /TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp | |
| parent | 0f3847bc7fd735ab88276fee59e2ebd6cb8d1f99 (diff) | |
| download | ATCD-c979767a00db4ea1299af482033a68829cc16675.tar.gz | |
ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp index e44399dc3dd..390d7b21b23 100644 --- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp @@ -20,11 +20,11 @@ INS_Locator::INS_Locator (ImR_Locator_i& loc) } char * -INS_Locator::locate (const char* object_key ACE_ENV_ARG_DECL) +INS_Locator::locate (const char* object_key) ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) { ACE_ASSERT (object_key != 0); - ACE_TRY + try { ACE_CString key (object_key); ssize_t poaidx = key.find ('/'); @@ -37,7 +37,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) ACE_DEBUG ((LM_DEBUG, "ImR: Activating server <%s>.\n", key.c_str ())); CORBA::String_var located = - this->imr_locator_.activate_server_by_object (key.c_str () ACE_ENV_ARG_PARAMETER); + this->imr_locator_.activate_server_by_object (key.c_str ()); ACE_CString tmp = located.in (); tmp += object_key; @@ -47,17 +47,20 @@ ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) return CORBA::string_dup (tmp.c_str ()); } - ACE_CATCH (ImplementationRepository::CannotActivate, ex) + catch (const ImplementationRepository::CannotActivate& ex) { - ACE_TRY_THROW (CORBA::TRANSIENT ( - CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), - CORBA::COMPLETED_NO)); + throw CORBA::TRANSIENT ( + CORBA::SystemException::_tao_minor_code ( + TAO_IMPLREPO_MINOR_CODE, + 0), + CORBA::COMPLETED_NO); } - ACE_CATCH (ImplementationRepository::NotFound, ex) + catch (const ImplementationRepository::NotFound& ex) { - ACE_TRY_THROW (CORBA::TRANSIENT ( - CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), - CORBA::COMPLETED_NO)); + throw CORBA::TRANSIENT ( + CORBA::SystemException::_tao_minor_code ( + TAO_IMPLREPO_MINOR_CODE, + 0), + CORBA::COMPLETED_NO); } - ACE_ENDTRY; } |