diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-12 14:49:02 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-12 14:49:02 +0000 |
| commit | cbe8aa5d5be1d4679ae0c4e30baaea24fbae416c (patch) | |
| tree | b9f7b9d73fe1ba0675ac5233476b66a61b8f8521 /TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp | |
| parent | a2dd5f907273d7561f3ccac51d7fffc8bb4b6893 (diff) | |
| download | ATCD-cbe8aa5d5be1d4679ae0c4e30baaea24fbae416c.tar.gz | |
This commit was manufactured by cvs2svn to create branch
'escher_x_4_9_integration_point'.
Diffstat (limited to 'TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp')
| -rw-r--r-- | TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp index e60fee07e27..2c62f431071 100644 --- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp +++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp @@ -19,8 +19,7 @@ namespace CIAO const char *ior_file_name_ = "executionManager.ior"; const char *init_file_name = "deployment.dat"; - static bool register_with_ns_ = false; - static bool write_to_ior_ = false; + bool register_with_ns_ = 0; bool parse_args (int argc, char *argv[]) @@ -31,14 +30,13 @@ namespace CIAO switch (c) { case 'o': - write_to_ior_ = true; ior_file_name_ = get_opts.opt_arg (); break; case 'i': init_file_name = get_opts.opt_arg (); break; case 'n': - register_with_ns_ = true; + register_with_ns_ = 1; break; case '?': // display help for use of the server. default: @@ -96,11 +94,12 @@ namespace CIAO CosNaming::NamingContext::_narrow (naming_context_object.in ()); // Initialize the Naming Sequence - CosNaming::Name name (1); - name.length (1); + CosNaming::Name name (2); + name.length (2); // String dup required for MSVC6 - name[0].id = CORBA::string_dup ("ExecutionManager"); + name[0].id = CORBA::string_dup ("CIAO"); + name[1].id = CORBA::string_dup ("ExecutionManager"); // Register the servant with the Naming Service naming_context->bind (name, @@ -174,8 +173,7 @@ namespace CIAO ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } - - if (write_to_ior_) + else { retval = write_ior_file (orb.in (), |