diff options
Diffstat (limited to 'TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp | 159 |
1 files changed, 44 insertions, 115 deletions
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 26939a27be7..e61e6b46315 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -21,8 +21,7 @@ namespace TAO { CORBA::Boolean Collocated_Object_Proxy_Broker::_is_a (CORBA::Object_ptr target, - const char *type_id - ACE_ENV_ARG_DECL) + const char *type_id) { TAO_Stub *stub = target->_stubobj (); @@ -32,32 +31,23 @@ namespace TAO == TAO_ORB_Core::THRU_POA) { TAO::Portable_Server::Servant_Upcall servant_upcall ( - stub->servant_orb_var ()->orb_core () - ); + stub->servant_orb_var ()->orb_core ()); CORBA::Object_var forward_to; servant_upcall.prepare_for_upcall ( stub->profile_in_use ()->object_key (), "_is_a", - forward_to.out () - ACE_ENV_ARG_PARAMETER - ); - ACE_CHECK_RETURN (0); - - servant_upcall.pre_invoke_collocated_request ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_CHECK_RETURN (0); - - return servant_upcall.servant ()->_is_a (type_id - ACE_ENV_ARG_PARAMETER); + forward_to.out ()); + + servant_upcall.pre_invoke_collocated_request (); + + return servant_upcall.servant ()->_is_a (type_id); } // Direct collocation strategy is used. if (target->_servant () != 0) { - return target->_servant ()->_is_a (type_id - ACE_ENV_ARG_PARAMETER); + return target->_servant ()->_is_a (type_id); } return 0; @@ -66,13 +56,12 @@ namespace TAO #if (TAO_HAS_MINIMUM_CORBA == 0) char * - Collocated_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Collocated_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target) { TAO_Stub *stub = target->_stubobj (); char * _tao_retval = 0; - ACE_TRY + try { // Which collocation strategy should we use? if (stub != 0 && @@ -80,51 +69,37 @@ namespace TAO ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA) { TAO::Portable_Server::Servant_Upcall servant_upcall ( - stub->servant_orb_var ()->orb_core () - ); + stub->servant_orb_var ()->orb_core ()); CORBA::Object_var forward_to; servant_upcall.prepare_for_upcall ( stub->profile_in_use ()->object_key (), "_repository_id", - forward_to.out () - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; + forward_to.out ()); _tao_retval = - servant_upcall.servant ()->_repository_id ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + servant_upcall.servant ()->_repository_id (); } // Direct collocation strategy is used. else if (target->_servant () != 0) { - _tao_retval = - target->_servant ()->_repository_id ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + _tao_retval = target->_servant ()->_repository_id (); } } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch (const ::CORBA::OBJECT_NOT_EXIST&) { // Ignore this exception. } - ACE_CATCHANY + catch (const ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval); return _tao_retval; } CORBA::Boolean - Collocated_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Collocated_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target) { CORBA::Boolean _tao_retval = true; @@ -136,50 +111,36 @@ namespace TAO ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA) { TAO::Portable_Server::Servant_Upcall servant_upcall ( - target->_stubobj ()->servant_orb_var ()->orb_core () - ); + target->_stubobj ()->servant_orb_var ()->orb_core ()); CORBA::Object_var forward_to; servant_upcall.prepare_for_upcall ( target->_stubobj ()->object_key (), "_non_existent", - forward_to.out () - ACE_ENV_ARG_PARAMETER - ); - ACE_CHECK_RETURN (_tao_retval); - - servant_upcall.pre_invoke_collocated_request ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_CHECK_RETURN (_tao_retval); - - _tao_retval = - servant_upcall.servant ()->_non_existent ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_CHECK_RETURN (_tao_retval); + forward_to.out ()); + + servant_upcall.pre_invoke_collocated_request (); + + _tao_retval = servant_upcall.servant ()->_non_existent (); } // Direct collocation strategy is used. else if (target->_servant () != 0) { - _tao_retval = - target->_servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval); + _tao_retval = target->_servant ()->_non_existent (); } return _tao_retval; } CORBA::Object_ptr - Collocated_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Collocated_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target) { CORBA::Object_var _tao_retval (CORBA::Object::_nil ()); TAO_Stub *stub = target->_stubobj (); - ACE_TRY + try { // Which collocation strategy should we use? if (stub != 0 && @@ -187,58 +148,42 @@ namespace TAO ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA) { TAO::Portable_Server::Servant_Upcall servant_upcall ( - stub->servant_orb_var ()->orb_core () - ); + stub->servant_orb_var ()->orb_core ()); CORBA::Object_var forward_to; servant_upcall.prepare_for_upcall ( stub->profile_in_use ()->object_key (), "_component", - forward_to.out () - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; + forward_to.out ()); - _tao_retval = - servant_upcall.servant ()->_get_component ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + _tao_retval = servant_upcall.servant ()->_get_component (); } // Direct collocation strategy is used. else if (target->_servant () != 0) { - _tao_retval = - target->_servant ()->_get_component ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + _tao_retval = target->_servant ()->_get_component (); } } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch (const ::CORBA::OBJECT_NOT_EXIST&) { // Ignore this exception. } - ACE_CATCHANY + catch (const ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval._retn ()); return _tao_retval._retn (); } CORBA::InterfaceDef_ptr - Collocated_Object_Proxy_Broker::_get_interface ( - CORBA::Object_ptr target - ACE_ENV_ARG_DECL) + Collocated_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target) { CORBA::InterfaceDef_ptr _tao_retval = 0; TAO_Stub *stub = target->_stubobj (); - ACE_TRY + try { // Which collocation strategy should we use? if (stub != 0 && @@ -246,50 +191,34 @@ namespace TAO == TAO_ORB_Core::THRU_POA) { TAO::Portable_Server::Servant_Upcall servant_upcall ( - target->_stubobj ()->servant_orb_var ()->orb_core () - ); + target->_stubobj ()->servant_orb_var ()->orb_core ()); CORBA::Object_var forward_to; servant_upcall.prepare_for_upcall ( target->_stubobj ()->object_key (), "_interface", - forward_to.out () - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; + forward_to.out ()); - servant_upcall.pre_invoke_collocated_request ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + servant_upcall.pre_invoke_collocated_request (); _tao_retval = - servant_upcall.servant ()->_get_interface ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + servant_upcall.servant ()->_get_interface (); } // Direct collocation strategy is used. else if (target->_servant () != 0) { - _tao_retval = - target->_servant ()->_get_interface ( - ACE_ENV_SINGLE_ARG_PARAMETER - ); - ACE_TRY_CHECK; + _tao_retval = target->_servant ()->_get_interface (); } } - ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + catch (const ::CORBA::OBJECT_NOT_EXIST&) { // Ignore this exception. } - ACE_CATCHANY + catch (const ::CORBA::Exception&) { - ACE_RE_THROW; + throw; } - ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval); return _tao_retval; } |