diff options
Diffstat (limited to 'TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp')
| -rw-r--r-- | TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp index 54f2829e160..4da473033d9 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp @@ -33,24 +33,19 @@ Basic_Logging_Service::init_ORB (int& argc, char *argv [] argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->poa_ = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); } int @@ -107,7 +102,6 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) // initialize the ORB. this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (this->parse_args (argc, argv) == -1) return -1; @@ -117,26 +111,21 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) this->basic_log_factory_.activate (this->orb_.in (), this->poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (obj.in ())); CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (true) { CORBA::Object_var table_object = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in ()); - ACE_CHECK_RETURN (-1); adapter->bind("BasicLogService", ior.in ()); - ACE_CHECK_RETURN (-1); } if (this->ior_file_name_ != 0) @@ -169,8 +158,7 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) if (this->bind_to_naming_service_) { // Resolve the naming service. - this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->resolve_naming_service (); CosNaming::Name name (1); name.length (1); @@ -179,19 +167,17 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL) this->naming_->rebind (name, obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } return 0; } void -Basic_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) +Basic_Logging_Service::resolve_naming_service (void) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) @@ -200,11 +186,10 @@ Basic_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) this->naming_ = CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int -Basic_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL) +Basic_Logging_Service::run (void) { if (this->nthreads_ > 0) { @@ -215,8 +200,7 @@ Basic_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL) return 0; } - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->orb_->run (); return 0; } @@ -227,8 +211,7 @@ Basic_Logging_Service::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { @@ -240,7 +223,7 @@ Basic_Logging_Service::svc (void) } void -Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Basic_Logging_Service::shutdown (void) { if (this->bind_to_naming_service_) { @@ -250,7 +233,6 @@ Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL) this->naming_->unbind (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // shutdown the ORB. |