1 files changed, 14 insertions, 29 deletions

diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
index b1c130c6057..e44275ac8eb 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
@@ -53,23 +53,20 @@ Server_Worker::parse_args (int argc, ACE_TCHAR *argv[])
 
 //
 int
-Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
+Server_Worker::test_main (int argc, ACE_TCHAR *argv[])
 {
   // Making sure there are no stale ior files to confuse a client
   ACE_OS::unlink (ior_file_.c_str ());
 
   ACE_Argv_Type_Converter cvt (argc, argv);
   CORBA::ORB_var orb = CORBA::ORB_init (cvt.get_argc (),
-                                        cvt.get_ASCII_argv () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+                                        cvt.get_ASCII_argv ());
 
   CORBA::Object_var poa_object =
-    orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    orb->resolve_initial_references("RootPOA");
 
   PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    PortableServer::POA::_narrow (poa_object.in ());
 
   if (CORBA::is_nil (root_poa.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -77,8 +74,7 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
                       1);
 
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    root_poa->the_POAManager ();
 
   if (parse_args (cvt.get_argc (), cvt.get_ASCII_argv ()) != 0)
     return 1;
@@ -91,25 +87,18 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
   PortableServer::ServantBase_var owner_transfer(hello_impl);
 
   PortableServer::ObjectId_var id =
-    root_poa->activate_object (hello_impl ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    root_poa->activate_object (hello_impl);
 
   CORBA::Object_var hello_obj =
-    root_poa->id_to_reference (id.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    root_poa->id_to_reference (id.in ());
 
   Test::Hello_var hello =
-    Test::Hello::_narrow (hello_obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    Test::Hello::_narrow (hello_obj.in ());
 
   CORBA::String_var ior =
-    orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    orb->object_to_string (hello.in ());
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  poa_manager->activate ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server activated POA manager\n")));
 
@@ -125,22 +114,18 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server entering the event loop\n")));
 
-  orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  orb->run ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server exiting the event loop\n")));
 
-  root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  root_poa->destroy (1, 1);
 
   // During normal test execution the ORB would have been destroyed
   // by a request from the client.
 
-  //  orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  //  ACE_CHECK;
+  //  orb->shutdown (0);
 
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  orb->destroy ();
 
   return 0;
 }