diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/PortableGroup')
27 files changed, 108 insertions, 575 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 2705c6ae78e..74563633343 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -20,10 +20,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL PortableServer::ObjectId * TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )) { // Get the RepositoryId from the Group reference so // we know what kind of reference to make. @@ -45,10 +41,6 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref) PortableGroup::IDs * TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )) { ACE_UNUSED_ARG (the_ref); @@ -58,10 +50,6 @@ TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref) void TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref, const PortableServer::ObjectId & oid) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )) { // Create a reference for the specified ObjectId, since // it is much easier to extract the object key from the @@ -76,10 +64,6 @@ TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref, void TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref, const PortableServer::ObjectId & oid) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )) { ACE_UNUSED_ARG (ref); ACE_UNUSED_ARG (oid); @@ -140,9 +124,6 @@ PortableServer::POA_ptr TAO_GOA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)) { PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name, poa_manager, @@ -153,8 +134,6 @@ TAO_GOA::create_POA (const char *adapter_name, PortableServer::POA_ptr TAO_GOA::find_POA (const char *adapter_name, CORBA::Boolean activate_it) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)) { PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name, activate_it); @@ -164,7 +143,6 @@ TAO_GOA::find_POA (const char *adapter_name, void TAO_GOA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_Regular_POA::destroy (etherealize_objects, wait_for_completion); @@ -175,7 +153,6 @@ TAO_GOA::destroy (CORBA::Boolean etherealize_objects, PortableServer::ThreadPolicy_ptr TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ThreadPolicy_ptr policy = this->TAO_Regular_POA::create_thread_policy (value); @@ -186,7 +163,6 @@ TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value) PortableServer::LifespanPolicy_ptr TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::LifespanPolicy_ptr policy = this->TAO_Regular_POA::create_lifespan_policy (value); @@ -195,7 +171,6 @@ TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value) PortableServer::IdUniquenessPolicy_ptr TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdUniquenessPolicy_ptr policy = this->TAO_Regular_POA::create_id_uniqueness_policy (value); @@ -205,7 +180,6 @@ TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va PortableServer::IdAssignmentPolicy_ptr TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::IdAssignmentPolicy_ptr policy = this->TAO_Regular_POA::create_id_assignment_policy (value); @@ -217,7 +191,6 @@ TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va PortableServer::ImplicitActivationPolicy_ptr TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ImplicitActivationPolicy_ptr policy = this->TAO_Regular_POA::create_implicit_activation_policy (value); @@ -226,7 +199,6 @@ TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo PortableServer::ServantRetentionPolicy_ptr TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ServantRetentionPolicy_ptr policy = this->TAO_Regular_POA::create_servant_retention_policy (value); @@ -236,7 +208,6 @@ TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy PortableServer::RequestProcessingPolicy_ptr TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::RequestProcessingPolicy_ptr policy = this->TAO_Regular_POA::create_request_processing_policy (value); @@ -248,7 +219,6 @@ TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPoli char * TAO_GOA::the_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { char * name = this->TAO_Regular_POA::the_name (); @@ -257,7 +227,6 @@ TAO_GOA::the_name (void) PortableServer::POA_ptr TAO_GOA::the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_ptr parent = this->TAO_Regular_POA::the_parent (); @@ -266,7 +235,6 @@ TAO_GOA::the_parent (void) PortableServer::POAList * TAO_GOA::the_children (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAList *children = this->TAO_Regular_POA::the_children (); @@ -275,7 +243,6 @@ TAO_GOA::the_children (void) PortableServer::POAManager_ptr TAO_GOA::the_POAManager (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAManager_ptr poa_manager = this->TAO_Regular_POA::the_POAManager (); @@ -287,7 +254,6 @@ TAO_GOA::the_POAManager (void) PortableServer::AdapterActivator_ptr TAO_GOA::the_activator (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::AdapterActivator_ptr activator = this->TAO_Regular_POA::the_activator (); @@ -296,15 +262,12 @@ TAO_GOA::the_activator (void) void TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->TAO_Regular_POA::the_activator (adapter_activator); } PortableServer::ServantManager_ptr TAO_GOA::get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { PortableServer::ServantManager_ptr servant_manager = this->TAO_Regular_POA::get_servant_manager (); @@ -313,17 +276,12 @@ TAO_GOA::get_servant_manager (void) void TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::set_servant_manager (imgr); } PortableServer::Servant TAO_GOA::get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::NoServant, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::get_servant (); @@ -332,8 +290,6 @@ TAO_GOA::get_servant (void) void TAO_GOA::set_servant (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::set_servant (servant); } @@ -342,9 +298,6 @@ TAO_GOA::set_servant (PortableServer::Servant servant) PortableServer::ObjectId * TAO_GOA::activate_object (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::activate_object (p_servant); @@ -354,10 +307,6 @@ TAO_GOA::activate_object (PortableServer::Servant p_servant) void TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::activate_object_with_id (id, p_servant); @@ -365,17 +314,12 @@ TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id, void TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { this->TAO_Regular_POA::deactivate_object (oid); } CORBA::Object_ptr TAO_GOA::create_reference (const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::create_reference (intf); @@ -385,7 +329,6 @@ TAO_GOA::create_reference (const char *intf) CORBA::Object_ptr TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::create_reference_with_id (oid, @@ -395,9 +338,6 @@ TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid, PortableServer::ObjectId * TAO_GOA::servant_to_id (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::servant_to_id (p_servant); @@ -406,9 +346,6 @@ TAO_GOA::servant_to_id (PortableServer::Servant p_servant) CORBA::Object_ptr TAO_GOA::servant_to_reference (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::servant_to_reference (p_servant); @@ -418,10 +355,6 @@ TAO_GOA::servant_to_reference (PortableServer::Servant p_servant) PortableServer::Servant TAO_GOA::reference_to_servant (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::reference_to_servant (reference); @@ -430,9 +363,6 @@ TAO_GOA::reference_to_servant (CORBA::Object_ptr reference) PortableServer::ObjectId * TAO_GOA::reference_to_id (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)) { PortableServer::ObjectId *object_id = this->TAO_Regular_POA::reference_to_id (reference); @@ -441,9 +371,6 @@ TAO_GOA::reference_to_id (CORBA::Object_ptr reference) PortableServer::Servant TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { PortableServer::Servant servant = this->TAO_Regular_POA::id_to_servant (oid); @@ -452,9 +379,6 @@ TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid) CORBA::Object_ptr TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) { CORBA::Object_ptr obj = this->TAO_Regular_POA::id_to_reference (oid); @@ -463,7 +387,6 @@ TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid) CORBA::OctetSeq * TAO_GOA::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->TAO_Regular_POA::id (); } @@ -558,8 +481,6 @@ void TAO_GOA::associate_group_with_ref ( CORBA::Object_ptr group_ref, CORBA::Object_ptr obj_ref) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NotAGroupObject)) { // Find the Group Component so that we can extract the Group ID. PortableGroup::TagGroupTaggedComponent *tmp_group_id; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h index 42a20bdbd8f..9ade43a0f85 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h @@ -55,183 +55,106 @@ public: //@{ virtual PortableServer::ObjectId * create_id_for_reference ( CORBA::Object_ptr the_ref - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )); + ); virtual PortableGroup::IDs * reference_to_ids ( CORBA::Object_ptr the_ref - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )); + ); virtual void associate_reference_with_id ( CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )); + ); virtual void disassociate_reference_with_id ( CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NotAGroupObject - )); + ); //@} // Standard POA interface methods PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, - const CORBA::PolicyList &policies) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterAlreadyExists, - PortableServer::POA::InvalidPolicy)); + const CORBA::PolicyList &policies); PortableServer::POA_ptr find_POA (const char *adapter_name, - CORBA::Boolean activate_it) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::AdapterNonExistent)); + CORBA::Boolean activate_it); void destroy (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean wait_for_completion); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value); - PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value); - PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value); - PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value); - PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - char * the_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char * the_name (void); - PortableServer::POA_ptr the_parent (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr the_parent (void); - PortableServer::POAList *the_children (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POAList *the_children (void); - PortableServer::POAManager_ptr the_POAManager (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POAManager_ptr the_POAManager (void); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::AdapterActivator_ptr the_activator (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::AdapterActivator_ptr the_activator (void); - void the_activator (PortableServer::AdapterActivator_ptr adapter_activator) - ACE_THROW_SPEC ((CORBA::SystemException)); + void the_activator (PortableServer::AdapterActivator_ptr adapter_activator); - PortableServer::ServantManager_ptr get_servant_manager (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + PortableServer::ServantManager_ptr get_servant_manager (void); - void set_servant_manager (PortableServer::ServantManager_ptr imgr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + void set_servant_manager (PortableServer::ServantManager_ptr imgr); - PortableServer::Servant get_servant (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::NoServant, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant get_servant (void); - void set_servant (PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + void set_servant (PortableServer::Servant servant); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)); + PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant); void activate_object_with_id (const PortableServer::ObjectId &id, - PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)); + PortableServer::Servant p_servant); - void deactivate_object (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + void deactivate_object (const PortableServer::ObjectId &oid); - CORBA::Object_ptr create_reference (const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + CORBA::Object_ptr create_reference (const char *intf); CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, - const char *intf) - ACE_THROW_SPEC ((CORBA::SystemException)); - - PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); - - CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); - - PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); - - PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); - - PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); - - CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); - - CORBA::OctetSeq *id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *intf); + + PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant); + + CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant); + + PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference); + + PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference); + + PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid); + + CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid); + + CORBA::OctetSeq *id (void); // End standard POA interface methods. @@ -279,9 +202,7 @@ protected: /// object references. void associate_group_with_ref ( CORBA::Object_ptr group_ref, - CORBA::Object_ptr obj_ref) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NotAGroupObject)); + CORBA::Object_ptr obj_ref); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp index 3ed2d1869a0..a7f6649c96c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp @@ -27,9 +27,6 @@ TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator (void) void TAO_PG_Default_Property_Validator::validate_property ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { const CORBA::ULong len = props.length (); @@ -78,9 +75,6 @@ TAO_PG_Default_Property_Validator::validate_property ( void TAO_PG_Default_Property_Validator::validate_criteria ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { const CORBA::ULong len = props.length (); PortableGroup::Criteria invalid_criteria; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index 15cf9257f0f..6d536b62078 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -46,18 +46,12 @@ public: /// Validate the given properties. Throw an exception when the /// first invalid property is encountered. The remaining properties /// will not be validated. - virtual void validate_property (const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + virtual void validate_property (const PortableGroup::Properties & props); /// Validate the given properties/criteria. All criteria /// will be validated regardless of whether or not an invalid /// property was encountered. - virtual void validate_criteria (const PortableGroup::Properties & criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + virtual void validate_criteria (const PortableGroup::Properties & criteria); private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index eaba8c3012d..d938aa82e6c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -285,10 +285,6 @@ void TAO::PG_FactoryRegistry::register_factory ( const char * type_id, const PortableGroup::FactoryInfo & factory_info ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::MemberAlreadyPresent - , PortableGroup::TypeConflict)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::register_factory); @@ -357,7 +353,6 @@ void TAO::PG_FactoryRegistry::unregister_factory ( const char * role, const PortableGroup::Location & location ) - ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory); @@ -446,7 +441,6 @@ void TAO::PG_FactoryRegistry::unregister_factory ( void TAO::PG_FactoryRegistry::unregister_factory_by_role ( const char * role ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory_by_role); @@ -492,7 +486,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role ( void TAO::PG_FactoryRegistry::unregister_factory_by_location ( const PortableGroup::Location & location ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::unregister_factory_by_location); @@ -606,7 +599,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( const char * role, CORBA::String_out type_id ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::list_factories_by_role); @@ -637,7 +629,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( ::PortableGroup::FactoryInfos * TAO::PG_FactoryRegistry::list_factories_by_location ( const PortableGroup::Location & location ) - ACE_THROW_SPEC ((CORBA::SystemException)) { METHOD_ENTRY(TAO::PG_FactoryRegistry::list_factories_by_location); ::PortableGroup::FactoryInfos_var result; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index dbc93df64f7..bd1bcfe5457 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -132,39 +132,30 @@ namespace TAO const char * role, const char * type_id, const PortableGroup::FactoryInfo & factory_info - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::MemberAlreadyPresent - , PortableGroup::TypeConflict)); + ); virtual void unregister_factory ( const char * role, const PortableGroup::Location & location - ) - ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound)); + ); virtual void unregister_factory_by_role ( const char * role - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void unregister_factory_by_location ( const PortableGroup::Location & location - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::PortableGroup::FactoryInfos * list_factories_by_role ( const char * role, CORBA::String_out type_id - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::PortableGroup::FactoryInfos * list_factories_by_location ( const PortableGroup::Location & location - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); ///////////////////////// // Implementation methods diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 74bdc8574dd..0b3fc40b9db 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -58,12 +58,6 @@ TAO_PG_GenericFactory::create_object ( const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)) { PortableGroup::Properties_var properties = this->property_manager_.get_type_properties (type_id); @@ -190,8 +184,6 @@ void TAO_PG_GenericFactory::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)) { CORBA::ULong fcid = 0; @@ -654,13 +646,6 @@ TAO_PG_GenericFactory::create_member ( const PortableGroup::FactoryInfo & factory_info, const char * type_id, const CORBA::Boolean propagate_member_already_present) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria, - PortableGroup::MemberAlreadyPresent)) { PortableGroup::GenericFactory::FactoryCreationId_var fcid; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 9d01a0cfc25..b5e0df56cb8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -74,13 +74,7 @@ public: const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)); + factory_creation_id); /** * Delete the object corresponding to the provided @@ -90,9 +84,7 @@ public: */ virtual void delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & - factory_creation_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)); + factory_creation_id); //@} @@ -142,14 +134,7 @@ public: PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::FactoryInfo & factory_info, const char * type_id, - const CORBA::Boolean propagate_member_already_present) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria, - PortableGroup::MemberAlreadyPresent)); + const CORBA::Boolean propagate_member_already_present); private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 0d02a65db04..dbcc166adf9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -72,12 +72,6 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group ( const char * type_id, const PortableGroup::Criteria & the_criteria, TAO::PG_Property_Set * typeid_properties) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)) { /////////////////////////////////// // Create an empty group reference @@ -123,8 +117,6 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group ( } void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)) { if (! destroy_group (object_group)) { @@ -134,8 +126,6 @@ void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_ void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroupId group_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)) { if (! destroy_group (group_id)) { @@ -193,7 +183,6 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroup_ptr object_ PortableGroup::ObjectGroups * TAO::PG_Group_Factory::groups_at_location ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException)) { size_t upper_limit = this->group_map_.current_size (); PortableGroup::ObjectGroups * result = 0; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index a42ba34d67a..950513257e7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -86,28 +86,17 @@ namespace TAO TAO::PG_Object_Group * create_group ( const char * type_id, const PortableGroup::Criteria & the_criteria, - TAO::PG_Property_Set * typeid_properties) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::InvalidProperty, - PortableGroup::CannotMeetCriteria)); + TAO::PG_Property_Set * typeid_properties); - void delete_group (PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)); + void delete_group (PortableGroup::ObjectGroup_ptr object_group); - void delete_group (PortableGroup::ObjectGroupId group_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotFound)); + void delete_group (PortableGroup::ObjectGroupId group_id); PortableGroup::ObjectGroups * groups_at_location ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException)); + const PortableGroup::Location & the_location); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp index 4fd9fac28f1..ea6a1a9b6ab 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp @@ -10,18 +10,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_PG_Null_Property_Validator::validate_property ( const PortableGroup::Properties &) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { } void TAO_PG_Null_Property_Validator::validate_criteria ( const PortableGroup::Properties &) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index b9f6dc18f15..c9922b98409 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -41,20 +41,14 @@ public: * This particular implementation performs no validation * whatsoever. */ - void validate_property (const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + void validate_property (const PortableGroup::Properties & props); /// Validate the given criteria. /** * This particular implementation performs no validation * whatsoever. */ - void validate_criteria (const PortableGroup::Properties & criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + void validate_criteria (const PortableGroup::Properties & criteria); }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index a102044e10c..e0b7e54be74 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -52,13 +52,6 @@ TAO_PG_ObjectGroupManager::create_member ( const PortableGroup::Location & /* the_location */, const char * /* type_id */, const PortableGroup::Criteria & /* the_criteria */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { throw CORBA::NO_IMPLEMENT (); } @@ -68,10 +61,6 @@ TAO_PG_ObjectGroupManager::add_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, CORBA::Object_ptr member) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)) { if (CORBA::is_nil (member)) throw CORBA::BAD_PARAM (); @@ -100,9 +89,6 @@ TAO_PG_ObjectGroupManager::_tao_add_member ( CORBA::Object_ptr member, const char * type_id, const CORBA::Boolean propagate_member_already_present) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory)) { if (CORBA::is_nil (member)) throw CORBA::BAD_PARAM (); @@ -149,10 +135,6 @@ TAO_PG_ObjectGroupManager::add_member_i ( const PortableGroup::Location & the_location, CORBA::Object_ptr member, const CORBA::Boolean check_type_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)) { TAO_PG_ObjectGroup_Map_Entry * group_entry = this->get_group_entry (object_group); @@ -221,9 +203,6 @@ PortableGroup::ObjectGroup_ptr TAO_PG_ObjectGroupManager::remove_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); @@ -296,8 +275,6 @@ TAO_PG_ObjectGroupManager::remove_member ( PortableGroup::Locations * TAO_PG_ObjectGroupManager::locations_of_members ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); @@ -333,7 +310,6 @@ TAO_PG_ObjectGroupManager::locations_of_members ( PortableGroup::ObjectGroups * TAO_PG_ObjectGroupManager::groups_at_location ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableGroup::ObjectGroups * ogs; ACE_NEW_THROW_EX (ogs, @@ -365,8 +341,6 @@ TAO_PG_ObjectGroupManager::groups_at_location ( PortableGroup::ObjectGroupId TAO_PG_ObjectGroupManager::get_object_group_id ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -387,8 +361,6 @@ TAO_PG_ObjectGroupManager::get_object_group_id ( PortableGroup::ObjectGroup_ptr TAO_PG_ObjectGroupManager::get_object_group_ref ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { TAO_PG_ObjectGroup_Map_Entry * entry = 0; @@ -413,9 +385,6 @@ CORBA::Object_ptr TAO_PG_ObjectGroupManager::get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & loc) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -457,10 +426,6 @@ PortableGroup::ObjectGroup_ptr TAO_PG_ObjectGroupManager::get_object_group_ref_from_id ( PortableGroup::ObjectGroupId group_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectGroupNotFound - )) { //@@ If we change the PG's concept of ObjectGroupId from // PortableServer::ObjectId to PortableGroup::ObjectGroupId, can @@ -592,8 +557,6 @@ TAO_PG_ObjectGroupManager::object_group (const PortableServer::ObjectId & oid) CORBA::ULong TAO_PG_ObjectGroupManager::member_count ( PortableGroup::ObjectGroup_ptr group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { // ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, // guard, @@ -616,8 +579,6 @@ TAO_PG_ObjectGroupManager::poa (PortableServer::POA_ptr p) PortableGroup::Properties * TAO_PG_ObjectGroupManager::get_properties ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { PortableGroup::Properties * properties = 0; ACE_NEW_THROW_EX (properties, @@ -648,8 +609,6 @@ TAO_PG_ObjectGroupManager::get_properties ( TAO_PG_ObjectGroup_Map_Entry * TAO_PG_ObjectGroupManager::get_group_entry ( CORBA::Object_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { if (CORBA::is_nil (this->poa_.in ())) throw CORBA::INTERNAL (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 2b0505f50cc..582fa5cc5d5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -68,24 +68,13 @@ public: PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, const char * type_id, - const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + const PortableGroup::Criteria & the_criteria); /// Add an existing object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr add_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, - CORBA::Object_ptr member) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)); + CORBA::Object_ptr member); /** * Remove an object at a specific location from the given @@ -96,54 +85,37 @@ public: */ virtual PortableGroup::ObjectGroup_ptr remove_member ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & the_location); /// Return the locations of the members in the given ObjectGroup. virtual PortableGroup::Locations * locations_of_members ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Return the locations of the members in the given ObjectGroup. virtual PortableGroup::ObjectGroups * groups_at_location ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableGroup::Location & the_location); /// Return the ObjectGroupId for the given ObjectGroup. /// @note Does this method make sense for load balanced objects? virtual PortableGroup::ObjectGroupId get_object_group_id ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// @note Does this method make sense for load balanced objects? virtual PortableGroup::ObjectGroup_ptr get_object_group_ref ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Return the reference corresponding to the member of a given /// ObjectGroup at the given location. virtual CORBA::Object_ptr get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Location & loc) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & loc); /** * TAO-specific extension. * Return the ObjectGroup reference for the given ObjectGroupId. */ virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id ( PortableGroup::ObjectGroupId group_id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::ObjectGroupNotFound - )); + ); //@} @@ -159,10 +131,7 @@ public: const PortableGroup::Location & the_location, CORBA::Object_ptr member, const char * type_id, - const CORBA::Boolean propagate_member_already_present) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory)); + const CORBA::Boolean propagate_member_already_present); /// Create object group hash map entry that represents an actual /// ObjectGroup. @@ -186,9 +155,7 @@ public: /// Return the properties set when the object group was created, and /// the dynamic properties that may have overridden them. PortableGroup::Properties * get_properties ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Return the type_id for the given object group. char * type_id (PortableGroup::ObjectGroup_ptr object_group); @@ -202,9 +169,7 @@ public: const PortableServer::ObjectId & oid); /// Return the number of members in the given object group. - CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group); /// Set the POA to use when converting object group references to /// ObjectIds. @@ -228,18 +193,12 @@ protected: PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, CORBA::Object_ptr member, - const CORBA::Boolean check_type_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::MemberAlreadyPresent, - PortableGroup::ObjectNotAdded)); + const CORBA::Boolean check_type_id); /// Obtain the ObjectGroup hash map entry corresponding to the given /// ObjectGroup reference. TAO_PG_ObjectGroup_Map_Entry * get_group_entry ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); /// Check if a member resides at the location to which the group diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 15ca6723cba..fce1e92db8e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -193,8 +193,6 @@ TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member) void TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location, CORBA::Object_ptr member) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectNotAdded)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -250,8 +248,6 @@ int TAO::PG_Object_Group::set_primary_member ( TAO_IOP::TAO_IOR_Property * prop, const PortableGroup::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::MemberNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -325,8 +321,6 @@ TAO::PG_Object_Group::set_primary_member ( void TAO::PG_Object_Group::remove_member ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::MemberNotFound)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); MemberInfo * info = 0; @@ -383,9 +377,6 @@ TAO::PG_Object_Group::get_object_group_id (void) const void TAO::PG_Object_Group::set_properties_dynamically ( const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -397,7 +388,6 @@ TAO::PG_Object_Group::set_properties_dynamically ( void TAO::PG_Object_Group::get_properties ( PortableGroup::Properties_var & result) const - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); this->properties_.export_properties(*result); @@ -506,7 +496,6 @@ TAO::PG_Object_Group::distribute_iogr (void) PortableGroup::Locations * TAO::PG_Object_Group::locations_of_members (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -539,9 +528,6 @@ TAO::PG_Object_Group::locations_of_members (void) CORBA::Object_ptr TAO::PG_Object_Group::get_member_reference ( const PortableGroup::Location & the_location) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::MemberNotFound)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -608,12 +594,6 @@ TAO::PG_Object_Group::create_member ( const PortableGroup::Location & the_location, const char * type_id, const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -698,8 +678,6 @@ TAO::PG_Object_Group::create_member ( void TAO::PG_Object_Group::create_members (size_t count) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::NoFactory)) { // assume internals is locked // @@ what if factories were passed as criteria? diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 18c687e2012..f5b5328b68e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -176,16 +176,12 @@ namespace TAO * @@TODO DOC */ void set_properties_dynamically ( - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * @@TODO DOC */ - void get_properties (PortableGroup::Properties_var & result) const - ACE_THROW_SPEC ((CORBA::SystemException)); + void get_properties (PortableGroup::Properties_var & result) const; /** * @@TODO DOC @@ -199,9 +195,7 @@ namespace TAO */ void add_member ( const PortableGroup::Location & the_location, - CORBA::Object_ptr member) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::ObjectNotAdded)); + CORBA::Object_ptr member); /** * set the replica at the given location to be primary. @@ -212,19 +206,13 @@ namespace TAO */ int set_primary_member ( TAO_IOP::TAO_IOR_Property * prop, - const PortableGroup::Location & the_location) - ACE_THROW_SPEC (( - CORBA::SystemException - , PortableGroup::MemberNotFound - )); + const PortableGroup::Location & the_location); /** * @@TODO DOC */ void remove_member ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & the_location); /** @@ -233,28 +221,18 @@ namespace TAO void create_member ( const PortableGroup::Location & the_location, const char * type_id, - const PortableGroup::Criteria & the_criteria) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::MemberAlreadyPresent, - PortableGroup::NoFactory, - PortableGroup::ObjectNotCreated, - PortableGroup::InvalidCriteria, - PortableGroup::CannotMeetCriteria)); + const PortableGroup::Criteria & the_criteria); /** * @@TODO DOC */ - PortableGroup::Locations * locations_of_members (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableGroup::Locations * locations_of_members (void); /** * @@TODO DOC */ CORBA::Object_ptr get_member_reference ( - const PortableGroup::Location & the_location) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::MemberNotFound)); + const PortableGroup::Location & the_location); /** @@ -284,11 +262,7 @@ namespace TAO PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member); - void create_members (size_t count) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::NoFactory - )); + void create_members (size_t count); ///////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp index 71c22906cae..9b6996230c1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp @@ -27,23 +27,17 @@ TAO::PG_Properties_Support::~PG_Properties_Support () void TAO::PG_Properties_Support::set_default_property (const char * name, const PortableGroup::Value & value) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->default_properties_.set_property(name, value); } void TAO::PG_Properties_Support::set_default_properties (const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->default_properties_.decode (props); } PortableGroup::Properties * TAO::PG_Properties_Support::get_default_properties () - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { PortableGroup::Properties_var result; ACE_NEW_THROW_EX ( result, PortableGroup::Properties(), CORBA::NO_MEMORY()); @@ -53,7 +47,6 @@ TAO::PG_Properties_Support::get_default_properties () void TAO::PG_Properties_Support::remove_default_properties ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->default_properties_.remove (props); } @@ -62,9 +55,6 @@ void TAO::PG_Properties_Support::set_type_properties ( const char *type_id, const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -84,7 +74,6 @@ TAO::PG_Properties_Support::set_type_properties ( PortableGroup::Properties * TAO::PG_Properties_Support::get_type_properties ( const char *type_id) - ACE_THROW_SPEC ( (CORBA::SystemException)) { PortableGroup::Properties_var result; ACE_NEW_THROW_EX (result, PortableGroup::Properties(), CORBA::NO_MEMORY ()); @@ -103,7 +92,6 @@ void TAO::PG_Properties_Support::remove_type_properties ( const char *type_id, const PortableGroup::Properties & props) - ACE_THROW_SPEC ( (CORBA::SystemException)) { // NOTE: do not actually delete the properties for this type. // There may be object groups depending on these. @@ -123,7 +111,6 @@ TAO::PG_Properties_Support::remove_type_properties ( TAO::PG_Property_Set * TAO::PG_Properties_Support::find_typeid_properties ( const char *type_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, 0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h index f3e6729c6f8..7af594f10f0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h @@ -73,8 +73,7 @@ namespace TAO * @value an Any containing the value. */ void set_default_property (const char * name, - const PortableGroup::Value & value) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableGroup::Value & value); /** * Update the default property set. @@ -84,8 +83,7 @@ namespace TAO * * @param props the set of properties to update the defaults. */ - void set_default_properties (const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException)); + void set_default_properties (const PortableGroup::Properties & props); /** * Export the default properties in PortableGroup::Properties format. @@ -96,10 +94,7 @@ namespace TAO * resource leaks. * @returns a newly allocated PortableGroup::Properties. */ - PortableGroup::Properties * get_default_properties (void) - ACE_THROW_SPEC ( (CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + PortableGroup::Properties * get_default_properties (void); /** * Undefine default properties that appear in props. @@ -111,8 +106,7 @@ namespace TAO * @param props a set of propertys to be removed by name. */ void remove_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException)); + const PortableGroup::Properties & props); /** * Override or define properties associated with a type_id. @@ -128,11 +122,7 @@ namespace TAO */ void set_type_properties ( const char *type_id, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Export the property set in a PortableGroup::Properties format. @@ -152,8 +142,7 @@ namespace TAO * @returns a newly allocated PortableGroup::Properties that must be released by the caller. */ PortableGroup::Properties * get_type_properties ( - const char *type_id) - ACE_THROW_SPEC ( (CORBA::SystemException)); + const char *type_id); /** * Export the property set in a PortableGroup::Properties format. @@ -169,8 +158,7 @@ namespace TAO * @returns a pointer to a Property_Set owned by this Properties_Support object. */ TAO::PG_Property_Set * find_typeid_properties ( - const char *type_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *type_id); /** * Undefine default properties that appear in props. @@ -183,8 +171,7 @@ namespace TAO */ void remove_type_properties ( const char *type_id, - const PortableGroup::Properties & props) - ACE_THROW_SPEC ( (CORBA::SystemException)); + const PortableGroup::Properties & props); /////////////// // Data Members diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp index 0ced0341ca0..bda9edab8c9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp @@ -28,9 +28,6 @@ TAO_PG_PropertyManager::TAO_PG_PropertyManager ( void TAO_PG_PropertyManager::set_default_properties ( const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { // First verify that the "Factories" property is not in the // Properties sequence. According to the spec, it is not allowed to @@ -58,7 +55,6 @@ TAO_PG_PropertyManager::set_default_properties ( PortableGroup::Properties * TAO_PG_PropertyManager::get_default_properties () - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); @@ -78,9 +74,6 @@ TAO_PG_PropertyManager::get_default_properties () void TAO_PG_PropertyManager::remove_default_properties ( const PortableGroup::Properties &props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { if (props.length () == 0) return; // @@ Throw CORBA::BAD_PARAM instead? @@ -96,9 +89,6 @@ void TAO_PG_PropertyManager::set_type_properties ( const char * type_id, const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { this->property_validator_.validate_property (overrides); @@ -121,7 +111,6 @@ TAO_PG_PropertyManager::set_type_properties ( PortableGroup::Properties * TAO_PG_PropertyManager::get_type_properties ( const char * type_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); @@ -168,9 +157,6 @@ void TAO_PG_PropertyManager::remove_type_properties ( const char * type_id, const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { if (props.length () == 0) return; // @@ Throw CORBA::BAD_PARAM instead? @@ -192,10 +178,6 @@ void TAO_PG_PropertyManager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr /* object_group */, const PortableGroup::Properties & /* overrides */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { #if 0 // First verify that the "InitialNumberMembers" property is not in @@ -227,8 +209,6 @@ TAO_PG_PropertyManager::set_properties_dynamically ( PortableGroup::Properties * TAO_PG_PropertyManager::get_properties ( PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)) { CORBA::ULong properties_len = 0; @@ -296,9 +276,6 @@ void TAO_PG_PropertyManager::remove_properties ( const PortableGroup::Properties & to_be_removed, PortableGroup::Properties &properties) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)) { const CORBA::ULong num_removed = to_be_removed.length (); if (num_removed == 0) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 21b5837e4c7..33162cb722b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -65,30 +65,20 @@ public: /// Set the default properties to be used by all object groups. virtual void set_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /// Get the default properties used by all object groups. - virtual PortableGroup::Properties * get_default_properties () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableGroup::Properties * get_default_properties (); /// Remove default properties. virtual void remove_default_properties ( - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /// Set properties associated with a given Member type. These /// properties override the default properties. virtual void set_type_properties ( const char * type_id, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Return the properties associated with a give Replica type. These @@ -96,16 +86,12 @@ public: * addition to the default properties that were not overridden. */ virtual PortableGroup::Properties * get_type_properties ( - const char * type_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * type_id); /// Remove the given properties associated with the Replica type ID. virtual void remove_type_properties ( const char * type_id, - const PortableGroup::Properties & props) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & props); /** * Dynamically set the properties associated with a given object @@ -115,11 +101,7 @@ public: */ virtual void set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, - const PortableGroup::Properties & overrides) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + const PortableGroup::Properties & overrides); /** * Return the properties currently in use by the given object @@ -129,9 +111,7 @@ public: * that weren't overridden. */ virtual PortableGroup::Properties * get_properties ( - PortableGroup::ObjectGroup_ptr object_group) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::ObjectGroupNotFound)); + PortableGroup::ObjectGroup_ptr object_group); //@} @@ -148,10 +128,7 @@ private: /// Remove properties "to_be_removed" from the given list of /// properties. void remove_properties (const PortableGroup::Properties & to_be_removed, - PortableGroup::Properties &properties) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableGroup::InvalidProperty, - PortableGroup::UnsupportedProperty)); + PortableGroup::Properties &properties); private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index 90d594d80d5..07739231579 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -28,7 +28,6 @@ TAO::PG_Property_Set::PG_Property_Set() TAO::PG_Property_Set::PG_Property_Set ( const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)) : defaults_ (0) { this->decode (property_set); @@ -37,7 +36,6 @@ TAO::PG_Property_Set::PG_Property_Set ( TAO::PG_Property_Set::PG_Property_Set ( const PortableGroup::Properties & property_set, PG_Property_Set * defaults) - ACE_THROW_SPEC ((CORBA::SystemException)) : defaults_ (defaults) { this->decode (property_set); @@ -57,7 +55,6 @@ TAO::PG_Property_Set::~PG_Property_Set () void TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -117,7 +114,6 @@ void TAO::PG_Property_Set::clear () } void TAO::PG_Property_Set::remove (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); size_t count = property_set.length (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index 50a5515baac..18d91812c72 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -70,8 +70,7 @@ namespace TAO * constructor * @param property_set the properties to be decoded */ - PG_Property_Set (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)); + PG_Property_Set (const PortableGroup::Properties & property_set); /** * constructor with defaults @@ -79,8 +78,7 @@ namespace TAO * @param defaults a propert set decoder that supplies default values. */ PG_Property_Set (const PortableGroup::Properties & property_set, - PG_Property_Set * defaults) - ACE_THROW_SPEC ((CORBA::SystemException)); + PG_Property_Set * defaults); /** * constructor with defaults, but no properties (yet) @@ -110,8 +108,7 @@ namespace TAO * Duplicate values replace previous values. * @param property_set the properties to be decoded */ - void decode (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)); + void decode (const PortableGroup::Properties & property_set); /** * Clear properties @@ -119,8 +116,7 @@ namespace TAO */ void clear (); - void remove (const PortableGroup::Properties & property_set) - ACE_THROW_SPEC ((CORBA::SystemException)); + void remove (const PortableGroup::Properties & property_set); /** * set or replace a single property diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index ce55617b726..e14b009500d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -9,6 +9,7 @@ #include "tao/Endpoint.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Leader_Follower.h" +#include "tao/SystemException.h" ACE_RCSID (PortableGroup, PortableGroup_Acceptor_Registry, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index 9ac5f584dd0..5fea4c9686a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -21,7 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_PortableGroup_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. @@ -59,7 +58,6 @@ TAO_PortableGroup_ORBInitializer::pre_init ( void TAO_PortableGroup_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index 0729f32766c..78d9db559d8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -40,11 +40,9 @@ class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer : public virtual TAO_Local_RefCounted_Object { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 82f5174c71d..d939ca0a3ae 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -5,7 +5,6 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" -#include "tao/Environment.h" #include "tao/Base_Transport_Property.h" #include "tao/Protocols_Hooks.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 31ce6b54f00..7010f88ca0b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -3,7 +3,6 @@ #include "orbsvcs/PortableGroup/UIPMC_Profile.h" #include "orbsvcs/PortableGroup/miopconf.h" #include "tao/CDR.h" -#include "tao/Environment.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" |