1 files changed, 22 insertions, 41 deletions

diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
index efac5ba2c36..29f8f3a3424 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(Recursive_ORBInitializer,
           "$Id$")
 
 
-int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int test_orb (CORBA::ORB_ptr orb)
 {
   int errors = 0;
 
@@ -17,31 +17,25 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   ACE_NEW_RETURN (test,
                   test_i, 1);
 
-  CORBA::Object_ptr object = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  CORBA::Object_ptr object = test->_this ();
 
   orb->register_initial_reference ("ORBMyService",
-                                    object
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+                                    object);
 
   bool invalid_name = false;
-  ACE_TRY
+  try
     {
       // Registering with an empty string should give an exception
       orb->register_initial_reference ("",
-                                       object
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       object);
     }
-  ACE_CATCH (CORBA::ORB::InvalidName, ex)
+  catch (const CORBA::ORB::InvalidName&)
     {
       invalid_name = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!invalid_name)
     {
@@ -51,22 +45,19 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
   bool duplicate_name = false;
-  ACE_TRY_EX (duplicate)
+  try
     {
       // Registering with an duplicate string should give an exception
       orb->register_initial_reference ("ORBMyService",
-                                        object
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (duplicate);
+                                        object);
     }
-  ACE_CATCH (CORBA::ORB::InvalidName, ex)
+  catch (const CORBA::ORB::InvalidName&)
     {
       duplicate_name = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!duplicate_name)
     {
@@ -76,25 +67,22 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
   bool invalid_object = false;
-  ACE_TRY_EX (invalid)
+  try
     {
       // Registering with a nil object
       orb->register_initial_reference ("ORBNilServer",
-                                       CORBA::Object::_nil()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (invalid);
+                                       CORBA::Object::_nil());
     }
-  ACE_CATCH (CORBA::BAD_PARAM , ex)
+  catch (const CORBA::BAD_PARAM& ex)
     {
       if ((ex.minor() & 0xFFFU) == 27)
         {
           invalid_object = true;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!invalid_object)
     {
@@ -119,30 +107,23 @@ main (int argc, char *argv[])
   PortableInterceptor::ORBInitializer_var initializer_var =
     initializer;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
-      retval = test_orb (orb.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = test_orb (orb.in ());
 
-      PortableInterceptor::register_orb_initializer (initializer_var.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer_var.in ());
 
       CORBA::ORB_var second_orb =
-        CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "SecondORB");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in server:");
+      ex._tao_print_exception ("Caught exception in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }