diff options
Diffstat (limited to 'TAO/tao/PortableServer/Object_Adapter.cpp')
-rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index bc65cf1fbc3..77a78f08282 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -509,30 +509,30 @@ TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key) this->locate_poa (key, id, poa); PortableServer::Servant servant = 0; - TAO_SERVANT_LOCATION const servant_location = + TAO_Servant_Location const servant_location = poa->locate_servant_i (id, servant); switch (servant_location) { - case TAO_SERVANT_FOUND: + case TAO_Servant_Location::Found: // Optimistic attitude - case TAO_DEFAULT_SERVANT: - case TAO_SERVANT_MANAGER: + case TAO_Servant_Location::Default_Servant: + case TAO_Servant_Location::Servant_Manager: return 0; - case TAO_SERVANT_NOT_FOUND: + case TAO_Servant_Location::Not_Found: return -1; } return -1; } -TAO_SERVANT_LOCATION +TAO_Servant_Location TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key, PortableServer::Servant &servant) { PortableServer::ObjectId id; - TAO_Root_POA *poa = 0; + TAO_Root_POA *poa = nullptr; this->locate_poa (key, id, poa); @@ -547,7 +547,7 @@ TAO_Object_Adapter::open () // If a POA extension hasn't changed the servant dispatcher, initialize the // default one. - if (this->servant_dispatcher_ == 0) + if (!this->servant_dispatcher_) { ACE_NEW (this->servant_dispatcher_, TAO_Default_Servant_Dispatcher); @@ -560,8 +560,7 @@ TAO_Object_Adapter::open () ::CORBA::PolicyList policy; PortableServer::POAManager_var poa_manager - = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME, - policy); + = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME, policy); #else PortableServer::POAManager_ptr poa_manager_ptr; ::CORBA::PolicyList policy_list; |