1 files changed, 16 insertions, 31 deletions

diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index b05e356507c..f6b1490fcda 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -62,17 +62,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -81,12 +78,10 @@ main (int argc, char *argv[])
 
       // Get a Root POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,20 +90,16 @@ main (int argc, char *argv[])
       Another_One_i another_one_impl (orb.in());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       Another_One_var another_one =
-        another_one_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        another_one_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       CORBA::String_var another_ior =
-        orb->object_to_string (another_one.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (another_one.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -117,12 +108,10 @@ main (int argc, char *argv[])
       if (ior_table_name != 0)
         {
           CORBA::Object_var table_object =
-             orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+             orb->resolve_initial_references ("IORTable");
 
           IORTable::Table_var adapter =
-             IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+             IORTable::Table::_narrow (table_object.in ());
 
           if (CORBA::is_nil (adapter.in ()))
             {
@@ -130,9 +119,8 @@ main (int argc, char *argv[])
               return -1;
             }
 
-          adapter->bind ( ior_table_name, ior.in () ACE_ENV_ARG_PARAMETER);
-          adapter->bind ( another_table_name, another_ior.in() ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          adapter->bind ( ior_table_name, ior.in ());
+          adapter->bind ( another_table_name, another_ior.in());
         }
 
 
@@ -161,8 +149,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Worker worker (orb.in ());
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -175,13 +162,11 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }