diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-11-07 19:50:27 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-11-07 19:50:27 +0000 |
| commit | e54f1d0eb50446691d49bdac2999285e41ec77fa (patch) | |
| tree | c5ee8b11be816dd42ae0ff70f8e6250fb064d146 | |
| parent | 8a46923e01dc20a0fdb5f774923f7f1d6f01cd45 (diff) | |
| download | ATCD-e54f1d0eb50446691d49bdac2999285e41ec77fa.tar.gz | |
ChangeLogTag:Tue Nov 7 19:06:12 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6f57f676e1e..c255dde9cc9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Tue Nov 7 19:06:12 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * tao/ORB_Core.cpp (orbinitializer_registry_i): + + Temporarily reverted + "Thu Nov 2 23:23:16 UTC 2006 Ossama Othman <ossama_othman at + symantec.com>" change. It's not completely correct since it + prevents dynamic ORB unloading from working properly when + ORBInitializers have been registered. The existing code isn't + correct either but go with it for now since it has been tested + more. + Tue Nov 7 12:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Two_Objects/worker.{h,cpp}: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 320b46fc935..2c6e3c9425f 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1621,9 +1621,9 @@ TAO_ORB_Core::policy_factory_registry_i (void) TAO::ORBInitializer_Registry_Adapter * TAO_ORB_Core::orbinitializer_registry_i (void) { - // The ORBInitializer_Registry is supposed to be a singleton. Store - // it in the global configuration, not the ORB-specific one. - ACE_Service_Gestalt * const config = ACE_Service_Config::global (); + // @todo The ORBInitializer_Registry is supposed to be a singleton. + + ACE_Service_Gestalt * const config = this->configuration (); // If not, lookup it up. this->orbinitializer_registry_ = |