diff options
Diffstat (limited to 'TAO/tests/LongUpcalls/AMI_Manager.cpp')
| -rw-r--r-- | TAO/tests/LongUpcalls/AMI_Manager.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp index 01b2d58bb9e..2ef6f261718 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.cpp +++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp @@ -20,11 +20,9 @@ validate_connection (Test::Controller_ptr controller CORBA::PolicyList_var unused; controller->_validate_connection (unused ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #else controller->_is_a ("Not_an_IDL_Type" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif } ACE_CATCHANY @@ -49,7 +47,6 @@ AMI_Manager::start_workers (CORBA::Short worker_count, validate_connection(controller ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "Starting %d workers\n", worker_count)); Worker worker (&thread_manager, @@ -62,7 +59,7 @@ AMI_Manager::start_workers (CORBA::Short worker_count, } void -AMI_Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL) +AMI_Manager::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -100,17 +97,14 @@ Worker::svc (void) -1); PortableServer::ServantBase_var auto_destroy (handler_impl); - handler = handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + handler = handler_impl->_this (); } validate_connection(this->controller_.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->controller_->sendc_worker_started (handler.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n")); @@ -119,7 +113,6 @@ Worker::svc (void) this->controller_->sendc_worker_finished (handler.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n")); @@ -127,7 +120,6 @@ Worker::svc (void) { ACE_Time_Value tv (0, 1000 * this->milliseconds_); this->orb_->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1); if (pending_requests == 0) @@ -153,7 +145,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex, } void -Controller_Handler::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller_Handler::worker_started (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); @@ -168,8 +160,7 @@ Controller_Handler::worker_started_excep { ACE_TRY { - h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + h->raise_exception (); } ACE_CATCHANY { @@ -181,7 +172,7 @@ Controller_Handler::worker_started_excep } void -Controller_Handler::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Controller_Handler::worker_finished (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); @@ -196,8 +187,7 @@ Controller_Handler::worker_finished_excep { ACE_TRY { - h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + h->raise_exception (); } ACE_CATCHANY { |