diff options
| author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-18 18:41:09 +0000 |
|---|---|---|
| committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-18 18:41:09 +0000 |
| commit | 46fa815edd399a93817b7bc620c1a120ca84d249 (patch) | |
| tree | d73cd6bb31dec0ace060d27d366eef6dbc9dfd72 /TAO/orbsvcs/orbsvcs/PortableGroup | |
| parent | e8038fbd94d34a543243991535ca9559e3ebe2a3 (diff) | |
| download | ATCD-46fa815edd399a93817b7bc620c1a120ca84d249.tar.gz | |
Various fixes for memory leaks and null pointer checks.
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/PortableGroup')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 5d05668cf2f..44455231bfd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -67,7 +67,7 @@ TAO::PG_Object_Group::PG_Object_Group ( , distribute_ (1) , empty_ (1) , role_ (type_id) - , type_id_ (CORBA::string_dup (type_id)) + , type_id_ (type_id) , tagged_component_ (tagged_component) , reference_ (CORBA::Object::_duplicate(empty_group)) , group_name_ (0) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp index 2ac1c0efe67..946ecae9632 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp @@ -484,9 +484,9 @@ TAO::PG_Object_Group_Storable::write (TAO::Storable_Base & stream) primary_location_cdr << PG_Object_Group::get_primary_location (); stream << primary_location_cdr; - ACE_CString reference_ior = + CORBA::String_var reference_ior = this->orb_->object_to_string (this->reference_.in ()); - stream << reference_ior; + stream << reference_ior.in (); TAO_OutputCDR tagged_component_cdr; tagged_component_cdr << this->tagged_component_; @@ -516,17 +516,17 @@ TAO::PG_Object_Group_Storable::write (TAO::Storable_Base & stream) stream << the_location_cdr; MemberInfo * member = it->item (); - ACE_CString member_ior = + CORBA::String_var member_ior = this->orb_->object_to_string (member->member_.in ()); - stream << member_ior; + stream << member_ior.in (); TAO_OutputCDR location_cdr; location_cdr << member->location_; stream << location_cdr; - ACE_CString factory_ior = + CORBA::String_var factory_ior = this->orb_->object_to_string (member->factory_.in ()); - stream << factory_ior; + stream << factory_ior.in (); TAO_OutputCDR factory_id_cdr; factory_id_cdr << member->factory_id_; |