diff options
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 27 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp | 2 |
4 files changed, 24 insertions, 17 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp index 67044b8191c..de47e349eb3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp @@ -80,7 +80,7 @@ ImR_Activator_Loader::create_object (CORBA::ORB_ptr, ACE_TCHAR **) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN(CORBA::NO_IMPLEMENT (), CORBA::Object::_nil ()); + throw CORBA::NO_IMPLEMENT (); } int diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index 6f4b0b2830c..cf596ceff99 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -140,12 +140,14 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, } if (!CORBA::is_nil (forward_obj.in ())) - ACE_THROW_RETURN (PortableServer::ForwardRequest (forward_obj.in ()), 0); + throw PortableServer::ForwardRequest (forward_obj.in ()); ACE_ERROR ((LM_ERROR, "Error: Forward_to reference is nil.\n")); - ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST ( - CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), - CORBA::COMPLETED_NO), 0); + throw CORBA::OBJECT_NOT_EXIST ( + CORBA::SystemException::_tao_minor_code ( + TAO_IMPLREPO_MINOR_CODE, + 0), + CORBA::COMPLETED_NO); } void diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 7b9dfe74f2f..d2e1a00db29 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -483,7 +483,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, if (info.null ()) { ACE_ERROR ((LM_ERROR, "ImR: Cannot find info for server <%s>\n", name)); - ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0); + throw ImplementationRepository::NotFound (); } return activate_server_i (*info, manual_start); @@ -546,8 +546,9 @@ ACE_THROW_SPEC ((CORBA::SystemException, waiter_svt_.unblock_all (info.name.c_str ()); - ACE_THROW_RETURN (ImplementationRepository::CannotActivate - (CORBA::string_dup ("Cannot start server.")), 0); + throw ImplementationRepository::CannotActivate( + CORBA::string_dup ( + "Cannot start server.")); } // Note: We already updated info with StartupInfo in server_is_running () @@ -593,8 +594,9 @@ ACE_THROW_SPEC ((CORBA::SystemException, ACE_DEBUG ((LM_DEBUG, "ImR: Cannot Activate <%s>.\n", info.name.c_str ())); } - ACE_THROW_RETURN (ImplementationRepository::CannotActivate - (CORBA::string_dup ("Cannot start server.")), 0); + throw ImplementationRepository::CannotActivate( + CORBA::string_dup ( + "Cannot start server.")); } ImplementationRepository::StartupInfo* @@ -608,16 +610,18 @@ ACE_THROW_SPEC ((CORBA::SystemException, { if (debug_ > 0) ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>. ActivationMode=MANUAL\n", info.name.c_str ())); - ACE_THROW_RETURN (ImplementationRepository::CannotActivate - (CORBA::string_dup ("Cannot implicitly activate MANUAL server.")), 0); + throw ImplementationRepository::CannotActivate( + CORBA::string_dup ( + "Cannot implicitly activate MANUAL server.")); } if (info.cmdline.length () == 0) { if (debug_ > 0) ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>." " No command line.\n", info.name.c_str ())); - ACE_THROW_RETURN (ImplementationRepository::CannotActivate - (CORBA::string_dup ("No command line registered for server.")), 0); + throw ImplementationRepository::CannotActivate( + CORBA::string_dup ( + "No command line registered for server.")); } Activator_Info_Ptr ainfo = get_activator (info.activator); @@ -627,8 +631,9 @@ ACE_THROW_SPEC ((CORBA::SystemException, if (debug_ > 0) ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>. " "Activator <%s> not found.\n", info.name.c_str (), info.activator.c_str ())); - ACE_THROW_RETURN (ImplementationRepository::CannotActivate - (CORBA::string_dup ("No activator registered for server.")), 0); + throw ImplementationRepository::CannotActivate( + CORBA::string_dup ( + "No activator registered for server.")); } try diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp index 36d09e380e6..da0fc913da9 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp @@ -74,7 +74,7 @@ ImR_Locator_Loader::create_object (CORBA::ORB_ptr, ACE_TCHAR**) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT(), CORBA::Object::_nil ()); + throw CORBA::NO_IMPLEMENT(); } int |