diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-04-17 13:30:42 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-04-17 13:30:42 +0200 |
| commit | afed34cf77bd8d2e2acbeb5991be019aade1c777 (patch) | |
| tree | eb5b26b9deb1c23ced9298d65a63254dd7629a37 | |
| parent | 280dd0e06c554183151e9443f8b217ad771d1918 (diff) | |
| download | ATCD-afed34cf77bd8d2e2acbeb5991be019aade1c777.tar.gz | |
Start the process watcher before the rir of the ImplRepoService
* TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index 08190a88c80..c43b30e9429 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -122,10 +122,6 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti if (this->debug_ > 1) ORBSVCS_DEBUG( (LM_DEBUG, "(%P|%t) ImR Activator: Contacting ImplRepoService...\n")); - // First, resolve the ImR, without this we can go no further - CORBA::Object_var obj = - orb_->resolve_initial_references ("ImplRepoService"); - #if defined (ACE_WIN32) // On Windows the notify of a death of a child process requires the // WFMO reactor which is not the default ORB reactor type so on @@ -144,6 +140,10 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti this->orb_->orb_core ()->reactor ()); #endif /* ACE_WIN32 */ + // First, resolve the ImR, without this we can go no further + CORBA::Object_var obj = + orb_->resolve_initial_references ("ImplRepoService"); + locator_ = ImplementationRepository::Locator::_narrow (obj.in ()); if (!CORBA::is_nil (locator_.in ())) @@ -155,8 +155,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti ior.in())); } - this->registration_token_ = - locator_->register_activator (name_.c_str (), activator); + this->registration_token_ = locator_->register_activator (name_.c_str (), activator); if (debug_ > 0) ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Registered with ImR\n")); |