diff options
| author | Steve Huston <shuston@riverace.com> | 2010-06-24 02:17:32 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2010-06-24 02:17:32 +0000 |
| commit | 3a3384d3e6710447adb08a481e6e03c3d155bb27 (patch) | |
| tree | 3052621686bf1bf883e13f439607d8f9447162f7 | |
| parent | c941a32bd5d28690a1b0546dcb073d5f5def321f (diff) | |
| download | ATCD-3a3384d3e6710447adb08a481e6e03c3d155bb27.tar.gz | |
ChangeLogTag:Thu Jun 24 02:07:18 UTC 2010 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ace/Service_Gestalt.inl | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 3c4ec8be740..da08cca2e0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 24 02:07:18 UTC 2010 Steve Huston <shuston@riverace.com> + + * ace/Service_Gestalt.inl (open): Allow the command line options to + override the passed ignore_static_svcs argument. Restores correct + operation, fixing Bugzilla #3865. + Fri Jun 18 19:58:55 UTC 2010 Steve Huston <shuston@riverace.com> * ace/Logging_Strategy.cpp: Add _get_dll_unload_policy() function that diff --git a/ace/Service_Gestalt.inl b/ace/Service_Gestalt.inl index 7f6b4754154..873a930ceab 100644 --- a/ace/Service_Gestalt.inl +++ b/ace/Service_Gestalt.inl @@ -36,6 +36,8 @@ ACE_Service_Gestalt::open (int argc, { ACE_TRACE ("ACE_Service_Gestalt::open"); + // Parsing argv may change no_static_svcs_ so set the default here, then + // parse, then pass the final value to open_i(). this->no_static_svcs_ = ignore_static_svcs; if (this->parse_args_i (argc, @@ -45,7 +47,7 @@ ACE_Service_Gestalt::open (int argc, return this->open_i (argv == 0 ? 0 : argv[0], logger_key, - ignore_static_svcs, + this->no_static_svcs_, ignore_default_svc_conf, ignore_debug_flag); } |