diff options
Diffstat (limited to 'TAO/examples/Load_Balancing')
| -rw-r--r-- | TAO/examples/Load_Balancing/Identity_i.cpp | 1 | ||||
| -rw-r--r-- | TAO/examples/Load_Balancing/Identity_i.h | 3 | ||||
| -rw-r--r-- | TAO/examples/Load_Balancing/Load_Balancer_i.cpp | 27 | ||||
| -rw-r--r-- | TAO/examples/Load_Balancing/Load_Balancer_i.h | 64 |
4 files changed, 19 insertions, 76 deletions
diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp index 9cb33e89fe2..72ed692d4b4 100644 --- a/TAO/examples/Load_Balancing/Identity_i.cpp +++ b/TAO/examples/Load_Balancing/Identity_i.cpp @@ -26,7 +26,6 @@ Identity_i::~Identity_i (void) void Identity_i::get_name (CORBA::String_out name ) - ACE_THROW_SPEC ((CORBA::SystemException)) { name = this->name_.in (); } diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h index 7a6abd8c61c..d6810cb9a7f 100644 --- a/TAO/examples/Load_Balancing/Identity_i.h +++ b/TAO/examples/Load_Balancing/Identity_i.h @@ -30,8 +30,7 @@ public: ~Identity_i (void); // Destructor. - virtual void get_name (CORBA::String_out name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void get_name (CORBA::String_out name); // Returns the name of this object. private: diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp index 9509b8c9a62..7211d5964e1 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp @@ -34,8 +34,6 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_round_robin (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)) { return make_group (0, id); @@ -43,8 +41,6 @@ Object_Group_Factory_i::make_round_robin (const char * id) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_random (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)) { return make_group (1, id); @@ -53,8 +49,6 @@ Object_Group_Factory_i::make_random (const char * id) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)) { ACE_CString group_id (id); @@ -113,8 +107,6 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::resolve (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)) { ACE_CString group_id (id); Load_Balancer::Object_Group_var group; @@ -168,14 +160,12 @@ Object_Group_Factory_i::list_groups (int random) Load_Balancer::Group_List * Object_Group_Factory_i::round_robin_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return list_groups (0); } Load_Balancer::Group_List * Object_Group_Factory_i::random_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return list_groups (1); } @@ -201,15 +191,12 @@ Object_Group_i::~Object_Group_i (void) char * Object_Group_i::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (id_.c_str ()); } void Object_Group_i::bind (const Load_Balancer::Member & member) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_member)) { ACE_CString member_id (member.id); CORBA::Object_var obj = CORBA::Object::_duplicate (member.obj.in ()); @@ -241,8 +228,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member) void Object_Group_i::unbind (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { ACE_CString member_id (id); @@ -270,8 +255,6 @@ Object_Group_i::unbind (const char * id) CORBA::Object_ptr Object_Group_i::resolve_with_id (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { CORBA::Object_var obj; ACE_CString member_id (id); @@ -284,7 +267,6 @@ Object_Group_i::resolve_with_id (const char * id) Load_Balancer::Member_ID_List * Object_Group_i::members (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Load_Balancer::Member_ID_List * list; @@ -312,7 +294,6 @@ Object_Group_i::members (void) void Object_Group_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Deregister with POA. PortableServer::POA_var poa = @@ -342,7 +323,6 @@ Random_Object_Group::~Random_Object_Group (void) void Random_Object_Group::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { //Deregisters this <Object_Group> with its // <Object_Group_Factory>. @@ -353,8 +333,6 @@ Random_Object_Group::destroy (void) CORBA::Object_ptr Random_Object_Group::resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { CORBA::Object_var obj; @@ -391,7 +369,6 @@ RR_Object_Group::~RR_Object_Group (void) void RR_Object_Group::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { //Deregisters this <Object_Group> with its // <Object_Group_Factory>. @@ -402,8 +379,6 @@ RR_Object_Group::destroy (void) CORBA::Object_ptr RR_Object_Group::resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { CORBA::Object_var obj; @@ -431,8 +406,6 @@ RR_Object_Group::resolve (void) void RR_Object_Group::unbind (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { ACE_CString member_id (id); diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index 923216e992e..79b9c8d73a9 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -53,40 +53,32 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. - Load_Balancer::Object_Group_ptr make_round_robin (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)); + Load_Balancer::Object_Group_ptr make_round_robin (const char * id); // Creates an <Object_Group> that resolves requests for arbitrary // members in round robin order. If an <Object_Group>, of any // type, with Group_ID <id> has already been created by this // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - Load_Balancer::Object_Group_ptr make_random (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)); + Load_Balancer::Object_Group_ptr make_random (const char * id); // Creates an <Object_Group> that resolves requests for arbitrary // members in random order. If an <Object_Group>, of any // type, with Group_ID <id> has already been created by this // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - Load_Balancer::Object_Group_ptr resolve (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)); + Load_Balancer::Object_Group_ptr resolve (const char * id); // Locates and returns an <Object_Group> by its <Group_ID>. If // no <Object_Group> has <Group_ID> of <id>, throw a // <no_such_group> exception. - Load_Balancer::Group_List * round_robin_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Load_Balancer::Group_List * round_robin_groups (void); // Lists all the round robin <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of <Group_ID>s of all existing round robin // <Object_Group>s created by this factory. - Load_Balancer::Group_List * random_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Load_Balancer::Group_List * random_groups (void); // Lists all the random <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of <Group_ID>s of all existing random @@ -107,9 +99,7 @@ private: // = Helper methods. Load_Balancer::Object_Group_ptr make_group (int random, - const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)); + const char * id); // This function factors out common code in <make_round_robin> and // <make_random>. Creates a random <Object_Group> if <random> parameter is // set to 1 and round robin <Object_Group> if it is 0. @@ -159,46 +149,36 @@ public: // = Load_Balancer::Object_Group idl methods. - char * id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char * id (void); // Get group's id. - void bind (const Load_Balancer::Member & member) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_member)); + void bind (const Load_Balancer::Member & member); // Adds a new <member> to the <Object_Group>. Note that each // <Member_ID> in an <Object_Group> must be unique. If the // group already contains a member with the same <Member_ID>, a // <duplicate_member> exceptions is thrown. - void unbind (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + void unbind (const char * id); // Removes a member with the specified <Member_ID> from the // <Object_Group>. If none of the group's members have a // Member_ID of <id>, <no_such_member> exception is thrown. CORBA::Object_ptr resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) = 0; + = 0; // Returns a member object from this <Object_Group> in accordance with // load balancing policy it implements, i.e., ``random'' or // ``round robin.'' If the group contains no members, <no_such_member> // exception is thrown. - CORBA::Object_ptr resolve_with_id (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + CORBA::Object_ptr resolve_with_id (const char * id); // Returns an object with the specified <Member_ID>. If this // <Object_Group> contains no members with the specified // <Member_ID>, <no_such_member> exception is thrown. - Load_Balancer::Member_ID_List * members (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Load_Balancer::Member_ID_List * members (void); // Return a sequence of <Member_ID>s of all of its members. - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its // <id> should become available. <Object_Group_Factory> @@ -251,14 +231,11 @@ public: ~Random_Object_Group (void); // Destructor. - CORBA::Object_ptr resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + CORBA::Object_ptr resolve (void); // Returns a member object from this <Object_Group> in accordance with // the "random" load balancing policy. - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its // <id> should become available. <Object_Group_Factory> @@ -280,21 +257,16 @@ public: ~RR_Object_Group (void); // Destructor. - void unbind (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + void unbind (const char * id); // We need to override the implementation of <unbind> from // Object_Group_i to make sure <resolve> // works correctly. - CORBA::Object_ptr resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + CORBA::Object_ptr resolve (void); // Returns a member object from this <Object_Group> in accordance with // the "round robin" load balancing policy. - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its // <id> should become available. <Object_Group_Factory> |