diff options
| author | jeliazkov_i <jeliazkov_i@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-05 16:26:36 +0000 |
|---|---|---|
| committer | jeliazkov_i <jeliazkov_i@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-05 16:26:36 +0000 |
| commit | db0db809615687143338133ffc2e0156310f5522 (patch) | |
| tree | 3722510b7f2f00af15511173bf6ad803e1d323c1 /TAO/tao/TAO_Internal.cpp | |
| parent | ca2e7d10323d5606aba71eebe65c1852ff2e079e (diff) | |
| download | ATCD-db0db809615687143338133ffc2e0156310f5522.tar.gz | |
ChangeLogTag: Fri May 5 16:12:17 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>
Diffstat (limited to 'TAO/tao/TAO_Internal.cpp')
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index d417436b45a..e696e393121 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -176,7 +176,14 @@ TAO::ORB::open_services (ACE_Service_Gestalt* pcfg, ACE_Service_Gestalt * theone = ACE_Service_Config::global (); if (pcfg != theone) { - int status = open_global_services_i (theone, argc, argv, skip_service_config_open); + ACE_Service_Config_Guard guard (theone); + + int status = + open_global_services_i (theone, + argc, + argv, + skip_service_config_open); + if (status == -1) { if (TAO_debug_level > 0) @@ -204,7 +211,6 @@ TAO::ORB::open_services (ACE_Service_Gestalt* pcfg, -1); return -1; } - return 0; } } @@ -265,7 +271,6 @@ namespace if (parse_global_args_i (argc, argv, global_svc_config_argv) == -1) return -1; - ACE_Service_Config_Guard guard (theone); register_global_services_i (theone); int global_svc_config_argc = global_svc_config_argv.length (); |