diff options
Diffstat (limited to 'TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp | 44 |
1 files changed, 14 insertions, 30 deletions
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index 13ee337c87e..6f9d111df4a 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -26,8 +26,7 @@ namespace TAO } void - RequestProcessingStrategyServantLocator::strategy_cleanup( - void) + RequestProcessingStrategyServantLocator::strategy_cleanup(void) { { Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -40,8 +39,7 @@ namespace TAO } PortableServer::ServantManager_ptr - RequestProcessingStrategyServantLocator::get_servant_manager ( - void) + RequestProcessingStrategyServantLocator::get_servant_manager (void) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -50,8 +48,7 @@ namespace TAO void RequestProcessingStrategyServantLocator::set_servant_manager ( - PortableServer::ServantManager_ptr imgr - ) + PortableServer::ServantManager_ptr imgr) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -66,8 +63,7 @@ namespace TAO CORBA::COMPLETED_NO); } - this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr - ); + this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr); this->validate_servant_manager (this->servant_locator_.in ()); } @@ -75,14 +71,11 @@ namespace TAO TAO_SERVANT_LOCATION RequestProcessingStrategyServantLocator::locate_servant ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant - ) + PortableServer::Servant &servant) { TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND; - location = this->poa_->servant_present (system_id, - servant - ); + location = this->poa_->servant_present (system_id, servant); if (location == TAO_SERVANT_NOT_FOUND) { @@ -101,15 +94,11 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &/*wait_occurred_restart_call*/ - ) + bool &/*wait_occurred_restart_call*/) { - PortableServer::Servant servant = 0; - - servant = this->poa_->find_servant (system_id, - servant_upcall, - poa_current_impl - ); + PortableServer::Servant servant = this->poa_->find_servant (system_id, + servant_upcall, + poa_current_impl); if (servant != 0) { @@ -162,8 +151,7 @@ namespace TAO this->servant_locator_->preinvoke (poa_current_impl.object_id (), this->poa_, operation, - cookie - ); + cookie); if (servant == 0) { @@ -183,8 +171,7 @@ namespace TAO void RequestProcessingStrategyServantLocator::cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id - ) + const PortableServer::ObjectId &user_id) { if (servant) { @@ -198,9 +185,7 @@ namespace TAO // This operation causes the association of the Object Id specified // by the oid parameter and its servant to be removed from the // Active Object Map. - int result = this->poa_->unbind_using_user_id (user_id); - - if (result != 0) + if (this->poa_->unbind_using_user_id (user_id) != 0) { throw ::CORBA::OBJ_ADAPTER (); } @@ -230,8 +215,7 @@ namespace TAO this->poa_, servant_upcall.operation (), servant_upcall.locator_cookie (), - servant_upcall.servant () - ); + servant_upcall.servant ()); } catch (const ::CORBA::Exception&) { |