diff options
| author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-09 19:09:43 +0000 |
|---|---|---|
| committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-09 19:09:43 +0000 |
| commit | 4d8a66113980285b1192a9af0b8ad7968fdce980 (patch) | |
| tree | 0784b5d8f092346fca67c43f7118ebda9bf5608f /ACE/ace/Service_Config.inl | |
| parent | 588a3fba9b83388465b418ceb9145cab346b118c (diff) | |
| download | ATCD-4d8a66113980285b1192a9af0b8ad7968fdce980.tar.gz | |
ChangeLogTag: Fri May 9 18:58:52 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
Diffstat (limited to 'ACE/ace/Service_Config.inl')
| -rw-r--r-- | ACE/ace/Service_Config.inl | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl index c76d1635eb5..b4849764874 100644 --- a/ACE/ace/Service_Config.inl +++ b/ACE/ace/Service_Config.inl @@ -16,11 +16,18 @@ ACE_Service_Config::open (const ACE_TCHAR program_name[], bool ignore_debug_flag) { ACE_TRACE ("ACE_Service_Config::open"); - return ACE_Service_Config::current()->open (program_name, - logger_key, - ignore_static_svcs, - ignore_default_svc_conf, - ignore_debug_flag); + if (singleton()->open_i (program_name, + logger_key, + ignore_static_svcs, + ignore_default_svc_conf, + ignore_debug_flag) == -1) + return -1; + + return current()->open (program_name, + logger_key, + ignore_static_svcs, + ignore_default_svc_conf, + ignore_debug_flag); } @@ -33,12 +40,19 @@ ACE_Service_Config::open (int argc, bool ignore_debug_flag) { ACE_TRACE ("ACE_Service_Config::open"); - return ACE_Service_Config::current()->open (argc, - argv, - logger_key, - ignore_static_svcs, - ignore_default_svc_conf, - ignore_debug_flag); + if (singleton()->open_i (argv[0], + logger_key, + ignore_static_svcs, + ignore_default_svc_conf, + ignore_debug_flag) == -1) + return -1; + + return current()->open (argc, + argv, + logger_key, + ignore_static_svcs, + ignore_default_svc_conf, + ignore_debug_flag); } // Handle the command-line options intended for the |