diff options
Diffstat (limited to 'TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp')
| -rw-r--r-- | TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 25b735ea832..ea6c55bd2ba 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -37,7 +37,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( CORBA::Short servant_priority, TAO_ServerRequest &req, TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL) + ) { TAO_Service_Context &request_service_context = req.request_service_context (); @@ -113,11 +113,11 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( context->context_data.length ()); CORBA::Boolean byte_order; if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); cdr.reset_byte_order (static_cast<int> (byte_order)); if ((cdr >> target_priority) == 0) - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); // Save the target priority in the response service // context to propagate back to the client as specified @@ -165,8 +165,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( if (tph->get_thread_CORBA_and_native_priority ( pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_ - ACE_ENV_ARG_PARAMETER) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + ) == -1) + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); ACE_DEBUG ((LM_DEBUG, @@ -200,8 +200,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( if (tph->get_thread_CORBA_and_native_priority ( pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_ - ACE_ENV_ARG_PARAMETER) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + ) == -1) + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); // Priority needs to be changed temporarily changed for the @@ -209,9 +209,9 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( if (target_priority != pre_invoke_state.original_CORBA_priority_) { if (tph->set_thread_CORBA_priority (target_priority - ACE_ENV_ARG_PARAMETER) + ) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); pre_invoke_state.state_ = @@ -221,7 +221,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( { CORBA::Short native_priority; tph->get_thread_native_priority (native_priority - ACE_ENV_ARG_PARAMETER); + ); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s processing using %s ") @@ -255,14 +255,12 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( CORBA::Policy_var policy = poa.policies ().get_cached_policy ( TAO_CACHED_POLICY_RT_SERVER_PROTOCOL - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); CORBA::Boolean set_server_network_priority = tph->set_server_network_priority (req.transport ()->tag (), policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ); TAO_Connection_Handler *connection_handler = req.transport ()->connection_handler (); @@ -274,7 +272,7 @@ void TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa, CORBA::Short servant_priority, TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ACE_ENV_ARG_DECL) + ) { TAO_Thread_Pool *thread_pool = static_cast <TAO_Thread_Pool *> (poa.thread_pool ()); @@ -310,9 +308,9 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa, if (tph->get_thread_CORBA_and_native_priority (pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_ - ACE_ENV_ARG_PARAMETER) + ) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); // Change the priority of the current thread for the duration of @@ -320,9 +318,9 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa, if (servant_priority != pre_invoke_state.original_CORBA_priority_) { if (tph->set_thread_CORBA_priority (servant_priority - ACE_ENV_ARG_PARAMETER) + ) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); pre_invoke_state.state_ = @@ -341,9 +339,8 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, pre_invoke_state.state_ = TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::NO_ACTION_REQUIRED; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Reset the priority of the current thread back to its original // value. @@ -352,13 +349,12 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, if (tph->set_thread_native_priority ( pre_invoke_state.original_native_priority_ - ACE_ENV_ARG_PARAMETER) + ) == -1) - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; } - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { // Eat up the exception. ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, @@ -366,7 +362,6 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, "Priority_Model_Processing::" "~Priority_Model_Processing"); } - ACE_ENDTRY; } } @@ -378,7 +373,7 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + ) { TAO_RT_POA *poa = 0; @@ -391,9 +386,8 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, thread_lock, orb_core, object_adapter - ACE_ENV_ARG_PARAMETER), + ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return poa; } |