diff options
Diffstat (limited to 'TAO/tao/PortableServer/POAManagerFactory.cpp')
-rw-r--r-- | TAO/tao/PortableServer/POAManagerFactory.cpp | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp index 8fa54df8ab7..eb3a8ef823f 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.cpp +++ b/TAO/tao/PortableServer/POAManagerFactory.cpp @@ -4,6 +4,7 @@ #include "tao/PortableServer/POAManager.h" #include "ace/OS_NS_string.h" +#include "ace/CORBA_macros.h" ACE_RCSID (PortableServer, POAManagerFactory, @@ -28,20 +29,15 @@ TAO_POAManager_Factory::create_POAManager ( const char * id, const ::CORBA::PolicyList & policies ) - ACE_THROW_SPEC ((CORBA::SystemException, - ::PortableServer::POAManagerFactory::ManagerAlreadyExists, - ::CORBA::PolicyError)) { // Validate the policy. TAO_POA_Policy_Set tao_policies (TAO_POA_Policy_Set (this->object_adapter_.default_poa_policies ())); // Merge policies from the ORB level. - this->object_adapter_.validator ().merge_policies (tao_policies.policies () - ); + this->object_adapter_.validator ().merge_policies (tao_policies.policies ()); // Merge in any policies that the user may have specified. - tao_policies.merge_policies (policies - ); + tao_policies.merge_policies (policies); // If any of the policy objects specified are not valid for the ORB // implementation, if conflicting policy objects are specified, or @@ -50,8 +46,7 @@ TAO_POAManager_Factory::create_POAManager ( // InvalidPolicy exception is raised containing the index in the // policies parameter value of the first offending policy object. tao_policies.validate_policies (this->object_adapter_.validator (), - this->object_adapter_.orb_core () - ); + this->object_adapter_.orb_core ()); PortableServer::POAManager_var poamanager; @@ -62,9 +57,7 @@ TAO_POAManager_Factory::create_POAManager ( // If we already have a manager with the same name throw an exception if (!CORBA::is_nil (poamanager.in())) { - ACE_THROW_RETURN ( - ::PortableServer::POAManagerFactory::ManagerAlreadyExists (), - ::PortableServer::POAManager::_nil ()); + throw ::PortableServer::POAManagerFactory::ManagerAlreadyExists (); } } @@ -86,9 +79,7 @@ TAO_POAManager_Factory::create_POAManager ( } ::PortableServer::POAManagerFactory::POAManagerSeq * -TAO_POAManager_Factory::list ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_POAManager_Factory::list (void) { ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers; CORBA::ULong number_of_poamanagers = static_cast <CORBA::ULong> @@ -114,9 +105,7 @@ TAO_POAManager_Factory::list ( } ::PortableServer::POAManager_ptr -TAO_POAManager_Factory::find ( - const char * id ) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_POAManager_Factory::find (const char * id ) { ::PortableServer::POAManager_ptr poamanager = ::PortableServer::POAManager::_nil(); @@ -125,8 +114,7 @@ TAO_POAManager_Factory::find ( iterator != this->poamanager_set_.end (); ++iterator) { - CORBA::String_var poamanagerid = - (*iterator)->get_id (); + CORBA::String_var poamanagerid = (*iterator)->get_id (); if (ACE_OS::strcmp (id, poamanagerid.in()) == 0) { @@ -155,8 +143,7 @@ int TAO_POAManager_Factory::remove_poamanager ( ::PortableServer::POAManager_ptr poamanager) { - int retval = 0; - retval = this->poamanager_set_.remove (poamanager); + int retval = this->poamanager_set_.remove (poamanager); if (retval == 0) { |