diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-15 15:47:53 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-15 15:47:53 +0000 |
| commit | b1cfe354dcbb547204b2f1c095da89dd312779ae (patch) | |
| tree | 83afc04ac556e79270e2ff6e397edadae6e64f69 | |
| parent | 36ca81c76c12e5c62b83a329b537cee3c8e91aa6 (diff) | |
| download | ATCD-b1cfe354dcbb547204b2f1c095da89dd312779ae.tar.gz | |
Fri Apr 15 10:46:56 CDT 2005 Gan Deng <dengg@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp | 14 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Container_Impl.cpp | 13 |
2 files changed, 15 insertions, 12 deletions
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp index b6406da05e2..1c7d476b948 100644 --- a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp +++ b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp @@ -26,6 +26,13 @@ usage (const ACE_TCHAR* program) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + // Initialize orb + CORBA::ORB_var orb = + CORBA::ORB_init (argc, + argv, + "" + ACE_ENV_ARG_PARAMETER); + // top level package URL char* package_url = 0; @@ -67,13 +74,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return -1; } - // Initialize the ORB so that CORBA::Any will work - // - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - ""); - try { xercesc::XMLPlatformUtils::Initialize(); diff --git a/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp b/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp index 335c0ea2a1a..52732cc1044 100644 --- a/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp +++ b/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp @@ -161,11 +161,14 @@ CIAO::Container_Impl::install ( comp_attributes[cur_len] = item; } - //std_configurator.set_configuration - ::Components::StandardConfigurator_var std_configurator = - comp->get_standard_configurator (); - - std_configurator->set_configuration (comp_attributes); + if (comp_attributes.length () != 0) + { + //std_configurator.set_configuration + ::Components::StandardConfigurator_var std_configurator = + comp->get_standard_configurator (); + + std_configurator->set_configuration (comp_attributes); + } } } ACE_CATCHANY |