diff options
| author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-28 23:51:51 +0000 |
|---|---|---|
| committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-28 23:51:51 +0000 |
| commit | f34026313f8efea7d49e09b0b98c1f060828a97c (patch) | |
| tree | 80a976334878b607116d8c9fc99e294492498b9a | |
| parent | 6c882e7e6832d7af5528d3fff1e85b0bd15cfcaa (diff) | |
| download | ATCD-f34026313f8efea7d49e09b0b98c1f060828a97c.tar.gz | |
Fixes in FT_Naming tests to avoid compilation issues and memory leaks
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3cefee43bdc..90092690d71 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Feb 28 23:49:27 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> + + * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: + + Avoid ambiguity in operator selection. + + * orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp: + + Explicitly destroy the RootPOA for cleanup. + Thu Feb 28 18:28:39 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * bin/tao_orb_tests.lst: diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index f7d003b8839..0dcb9f0bba2 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -1499,7 +1499,7 @@ do_persistence_objectgroup_test ( { PortableGroup::Locations_var locations = naming_manager_1->locations_of_members (group_var.in()); - const PortableGroup::Location & loc = locations[0]; + const PortableGroup::Location & loc = locations[CORBA::ULong (0)]; unsigned int num_locations = locations->length(); PortableGroup::Location location_name (1); diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp index 118dbf28321..2735ab1f98f 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp @@ -19,6 +19,9 @@ LB_server::destroy (void) try { this->naming_manager_->delete_object_group ("Basic Group"); + + this->root_poa_->destroy (1, 1); + this->orb_->destroy (); } catch (const CORBA::Exception& ex) |