diff options
| author | Phil Mesnier <mesnierp@ociweb.com> | 2015-11-25 18:39:15 -0600 |
|---|---|---|
| committer | Phil Mesnier <mesnierp@ociweb.com> | 2015-11-25 18:39:15 -0600 |
| commit | 6b7b569d127a6691c38b2c3de47c44e64fde5fbd (patch) | |
| tree | ccf52cb77b86d65932819ed8df34c68019359769 | |
| parent | 2c24499f5c0945067bd7945318ff8ce9725797f0 (diff) | |
| parent | d5e1d98d743cbe4779ecb74ed5fe7ea63089bed3 (diff) | |
| download | ATCD-6b7b569d127a6691c38b2c3de47c44e64fde5fbd.tar.gz | |
Merge pull request #171 from pmesnier/master
Incremental fix for recent ImR feature
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/global.features | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features index a571c7deafb..e5bc8b03dc6 100644 --- a/ACE/bin/MakeProjectCreator/config/global.features +++ b/ACE/bin/MakeProjectCreator/config/global.features @@ -21,10 +21,10 @@ acexml = 1 ace_svcconf = 1 ace_token = 1 +ace_idl_dependencies = 1 // By default we disable these. ace_for_tao = 0 -ace_idl_dependencies = 0 cross_compile = 0 ssl = 0 qos = 0 diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp index 969c6b41080..85375e9bab3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp @@ -203,6 +203,7 @@ AsyncAccessManager::final_state (bool active) { this->locator_.remove_server_i (this->info_.edit()); this->remove_on_death_rh_->send_ior(""); + this->remove_on_death_rh_ = 0; } AsyncAccessManager_ptr aam (this); this->locator_.remove_aam (aam); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 01365a06b18..e38859affe6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -1368,7 +1368,11 @@ ImR_Locator_i::server_is_shutting_down { this->pinger_.remove_server (info->ping_id()); { - AsyncAccessManager_ptr aam = this->find_aam (info->ping_id ()); + AsyncAccessManager_ptr aam = this->find_aam (info->ping_id (), false); + if (aam.is_nil()) + { + aam = this->find_aam(info->ping_id(), true); + } if (!aam.is_nil()) { aam->server_is_shutting_down (); |