diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-02 14:03:36 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-02 14:03:36 +0000 |
| commit | 1e7de8dddd375f33dd90a42f80489feddd08ba26 (patch) | |
| tree | d5b074d9dd96c2e8a77e7bd5d975564c68480e2e | |
| parent | 8273a7204aec926bc61af2023120959a62ec3a43 (diff) | |
| download | ATCD-1e7de8dddd375f33dd90a42f80489feddd08ba26.tar.gz | |
Wed Dec 2 14:01:43 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com>
* tao/RTCORBA/RT_ORB_Loader.cpp:
Improved a little the fix for bug#3755. There is no need
to obtain a global gestalt.
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RT_ORB_Loader.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e078f570273..33b63c9a75c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 2 14:01:43 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com> + + * tao/RTCORBA/RT_ORB_Loader.cpp: + Improved a little the fix for bug#3755. There is no need + to obtain a global gestalt. + Wed Dec 2 12:32:36 UTC 2009 Denis Budko <denis.budko@remedy.nl> * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 53172b07b30..794b1a9e3dc 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -32,14 +32,14 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[]) ACE_TRACE ("TAO_RT_ORB_Loader::init"); ACE_Service_Gestalt *gestalt = ACE_Service_Config::current (); - ACE_Service_Gestalt *global = ACE_Service_Config::global (); ACE_Service_Object * const rt_loader = ACE_Dynamic_Service<ACE_Service_Object>::instance ( gestalt, - "RT_ORB_Loader"); + "RT_ORB_Loader", + true); - if (rt_loader != 0 && rt_loader != this && gestalt == global) + if (rt_loader != 0 && rt_loader != this) { this->initialized_ = true; return rt_loader->init (argc, argv); |