diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-03 00:14:29 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-03 00:14:29 +0000 |
| commit | c7ef59e9935283ddcc42239808d098de8423342f (patch) | |
| tree | 2b7467933bf44aca9f99ce97b96b5bdbaff841bf | |
| parent | ddc3aa1a7f758604b172dbc51a3eaddfa02b16ff (diff) | |
| download | ATCD-c7ef59e9935283ddcc42239808d098de8423342f.tar.gz | |
ChangeLogTag:Thu Aug 02 17:09:53 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Test_Client_Module.cpp | 8 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/client.cpp | 12 |
3 files changed, 12 insertions, 16 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 6aaf6a3e594..860c4467634 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Thu Aug 02 17:09:53 2001 Ossama Othman <ossama@uci.edu> + + * tests/DLL_ORB/*: + + New test that dynamically loads a shared object that initializes + an ORB upon initialization of that shared object, and destroys + that ORB upon finalization of the shared object. [Bug 832] + Thu Aug 2 11:44:51 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Leader_Follower.cpp: Added a #include. This should take care diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index b96deb6bacc..f0530039e49 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -66,10 +66,9 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - // Add two to the new argc since - // "dummy -ORBSkipServiceConfigOpen" is being added to the argv - // vector. - int new_argc = argc + 2; + // Prepend a "dummy" program name argument to the Service + // Configurator argument vector. + int new_argc = argc + 1; CORBA::StringSeq new_argv (new_argc); new_argv.length (new_argc); @@ -78,7 +77,6 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) // again since the Service Configurator file is already in the // process of being opened. new_argv[0] = CORBA::string_dup ("dummy"); - new_argv[1] = CORBA::string_dup ("-ORBSkipServiceConfigOpen"); // Copy the remaining arguments into the new argument vector. for (int i = new_argc - argc, j = 0; diff --git a/TAO/tests/DLL_ORB/client.cpp b/TAO/tests/DLL_ORB/client.cpp index 098bf6763c8..1cb60dee474 100644 --- a/TAO/tests/DLL_ORB/client.cpp +++ b/TAO/tests/DLL_ORB/client.cpp @@ -17,16 +17,6 @@ int main (int, char *[]) { - // Until the ACE_Service_Configurator's underlying parser (generated - // by byacc) becomes reentrant, we need to explicitly load the file - // IOR parser before initializing the ORB. - if (ACE_Service_Config::process_directive ("dynamic FILE_Parser Service_Object * TAO:_make_TAO_FILE_Parser()") != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "ERROR: Client unable to initialize \"file\" " - "IOR parser."), - -1); - // Process a Service Configurator directive that will cause the test // client module to be dynamically loaded. // @@ -37,7 +27,7 @@ main (int, char *[]) // // In the process of doing this, the Test method provided by target // CORBA object will be invoked. - if (ACE_Service_Config::process_directive ("dynamic Client_Module Service_Object * Test_Client_Module:_make_Test_Client_Module() \"-k file://test.ior\"") != 0) + if (ACE_Service_Config::process_directive ("dynamic Client_Module Service_Object * Test_Client_Module:_make_Test_Client_Module() \"-k file://test.ior -ORBDebugLevel 4 -ORBDebug\"") != 0) { ACE_ERROR_RETURN ((LM_ERROR, |