diff options
| -rw-r--r-- | TAO/tao/ORB.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.i | 2 | ||||
| -rw-r--r-- | TAO/tao/Object_Ref_Table.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Object_Ref_Table.inl | 2 | ||||
| -rw-r--r-- | TAO/tao/PI/ORBInitInfo.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/RTScheduling/Current.cpp | 6 |
7 files changed, 12 insertions, 11 deletions
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index c50992b9835..7f2b781b825 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1170,7 +1170,7 @@ CORBA::ORB::resolve_initial_references (const char *name, // Search the object reference table. This search must occur before // the InitRef table search, since it may contain local objects. result = - this->orb_core ()->object_ref_table ().resolve_initial_references ( + this->orb_core ()->object_ref_table ().resolve_initial_reference ( name); } diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 12ccac6fe7a..41b493ce99d 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -587,7 +587,7 @@ TAO_ORB_Core::resolve_rt_orb (void) { // Save a reference to the priority mapping manager. this->rt_orb_ = - this->object_ref_table ().resolve_initial_references ( + this->object_ref_table ().resolve_initial_reference ( TAO_OBJID_RTORB); } } diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index 1637658c438..705ef575161 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -73,7 +73,7 @@ public: /// Return the object reference associated with the given ID. /// A duplicate is returned. - CORBA::Object_ptr resolve_initial_references (const char * id); + CORBA::Object_ptr resolve_initial_reference (const char * id); /// Explicitly destroy the contents of the object reference table. void destroy (void); diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl index 17a7c4fd4d3..e2cc5ccccab 100644 --- a/TAO/tao/Object_Ref_Table.inl +++ b/TAO/tao/Object_Ref_Table.inl @@ -18,7 +18,7 @@ TAO_Object_Ref_Table::register_initial_reference ( } ACE_INLINE CORBA::Object_ptr -TAO_Object_Ref_Table::resolve_initial_references ( +TAO_Object_Ref_Table::resolve_initial_reference ( const char * id) { return this->find (id); // Returns a duplicate. diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index 4d1fb32feda..36ad778a95a 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -193,7 +193,8 @@ TAO_ORBInitInfo::resolve_initial_references ( // is reached so just use the ORB's resolve_initial_references() // mechanism. return - this->orb_core_->orb ()->resolve_initial_references (id); + this->orb_core_->orb ()->resolve_initial_references (id + ACE_ENV_ARG_PARAMETER); } void diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 829c9539665..445527d960a 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -43,7 +43,7 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core // Save a reference to the priority mapping manager. CORBA::Object_var obj = - orb_core->object_ref_table ().resolve_initial_references ( + orb_core->object_ref_table ().resolve_initial_reference ( TAO_OBJID_PRIORITYMAPPINGMANAGER); this->mapping_manager_ = @@ -53,7 +53,7 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core // Save a reference to the priority mapping manager. CORBA::Object_var object = - orb_core->object_ref_table ().resolve_initial_references ( + orb_core->object_ref_table ().resolve_initial_reference ( TAO_OBJID_NETWORKPRIORITYMAPPINGMANAGER); this->network_mapping_manager_ = @@ -62,7 +62,7 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core ACE_CHECK; object = - this->orb_core_->object_ref_table ().resolve_initial_references ( + this->orb_core_->object_ref_table ().resolve_initial_reference ( TAO_OBJID_RTCURRENT); this->current_ = diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index ec43bccf2b2..139f52609f6 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -298,7 +298,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (TAO_ORB_Core* orb, dt_hash_ (dt_hash) { CORBA::Object_var scheduler_obj = - this->orb_->object_ref_table ().resolve_initial_references ( + this->orb_->object_ref_table ().resolve_initial_reference ( "RTScheduler"); this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in () @@ -326,7 +326,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i ( dt_hash_ (dt_hash) { CORBA::Object_ptr scheduler_obj = - orb->object_ref_table ().resolve_initial_references ( + orb->object_ref_table ().resolve_initial_reference ( "RTScheduler"); this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj @@ -576,7 +576,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority, this->orb_->orb_params ()->sched_policy (); CORBA::Object_var object = - this->orb_->object_ref_table ().resolve_initial_references ( + this->orb_->object_ref_table ().resolve_initial_reference ( TAO_OBJID_PRIORITYMAPPINGMANAGER); RTCORBA::PriorityMappingManager_var mapping_manager = |