diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming')
5 files changed, 6 insertions, 18 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp index ba5b5f8aa20..d2aaabc01b2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -672,17 +672,11 @@ TAO_FT_Naming_Manager::create_object ( //////////////////////////////// // find the properties for this // type of object group - ACE_Auto_Ptr<TAO::PG_Property_Set> typeid_properties + TAO::PG_Property_Set_var typeid_properties = (this->properties_support_.find_typeid_properties (type_id)); TAO::PG_Object_Group * group = this->group_factory_.create_group - ( type_id, - the_criteria, - typeid_properties.get (), - true); - - // The group now owns the properties. - typeid_properties.release (); + ( type_id, the_criteria, typeid_properties); group->set_name (object_name); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp index 93b03929f61..5890db3344d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp @@ -95,8 +95,7 @@ TAO::FT_PG_Group_Factory::create_persistent_group ( const PortableGroup::TagGroupTaggedComponent & tagged_component, const char * type_id, const PortableGroup::Criteria & the_criteria, - TAO::PG_Property_Set * type_properties, - bool give_properties, + const TAO::PG_Property_Set_var & type_properties, TAO::Storable_Factory & storable_factory) { TAO::PG_Object_Group_Storable * objectGroup = 0; @@ -111,7 +110,6 @@ TAO::FT_PG_Group_Factory::create_persistent_group ( type_id, the_criteria, type_properties, - give_properties, storable_factory ), CORBA::NO_MEMORY()); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h index b84f79f560b..4c411ed4e4d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h @@ -62,8 +62,7 @@ namespace TAO const PortableGroup::TagGroupTaggedComponent & tagged_component, const char * type_id, const PortableGroup::Criteria & the_criteria, - TAO::PG_Property_Set * type_properties, - bool give_properties, + const TAO::PG_Property_Set_var & type_properties, TAO::Storable_Factory & storable_factory); virtual PG_Object_Group_Storable * restore_persistent_group ( diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp index 8328eeccd61..546e1a7e54d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp @@ -16,8 +16,7 @@ TAO::FT_PG_Object_Group_Storable::FT_PG_Object_Group_Storable ( const PortableGroup::TagGroupTaggedComponent & tagged_component, const char * type_id, const PortableGroup::Criteria & the_criteria, - TAO::PG_Property_Set * type_properties, - bool give_properties, + const TAO::PG_Property_Set_var & type_properties, TAO::Storable_Factory & storable_factory) : PG_Object_Group_Storable(orb, factory_registry, @@ -27,7 +26,6 @@ TAO::FT_PG_Object_Group_Storable::FT_PG_Object_Group_Storable ( type_id, the_criteria, type_properties, - give_properties, storable_factory) , stale_ (false) , file_created_ (false) diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h index 463299b70df..e5e146441ce 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h @@ -58,8 +58,7 @@ namespace TAO const PortableGroup::TagGroupTaggedComponent & tagged_component, const char * type_id, const PortableGroup::Criteria & the_criteria, - TAO::PG_Property_Set * type_properties, - bool give_properties, + const TAO::PG_Property_Set_var & type_properties, TAO::Storable_Factory & storable_factory); /** |