1 files changed, 18 insertions, 36 deletions

diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 2b6a232470a..d33f1f43d70 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -38,25 +38,23 @@ bool
 no_factory (OBV_FactoryTest::Test_ptr test)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Calling this without a factory registred should give a marshal
       // exception with minor code 1
       OBV_FactoryTest::BaseValue_var base_value =
-        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_base_value ();
     }
-  ACE_CATCH (CORBA::MARSHAL, ex)
+  catch (const CORBA::MARSHAL& ex)
     {
       if ((ex.minor() & 0xFFFU) == 1)
         {
           succeed = true;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -70,23 +68,20 @@ no_factory (OBV_FactoryTest::Test_ptr test)
 int
 main (int argc, char *argv[])
 {
-  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, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Obtain reference to the object
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       OBV_FactoryTest::Test_var test =
-        OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        OBV_FactoryTest::Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -108,9 +103,7 @@ main (int argc, char *argv[])
                       1); // supplied by mapping
 
       orb->register_value_factory (base_factory->tao_repository_id (),
-                                   base_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   base_factory);
       base_factory->_remove_ref (); // release ownership
 
       OBV_FactoryTest::Value1_init *value1_factory = 0;
@@ -119,9 +112,7 @@ main (int argc, char *argv[])
                       1); // supplied by mapping
 
       orb->register_value_factory (value1_factory->tao_repository_id (),
-                                   value1_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value1_factory);
       value1_factory->_remove_ref ();
 
       OBV_FactoryTest::Value2_init *value2_factory = 0;
@@ -130,24 +121,19 @@ main (int argc, char *argv[])
                       1); // custom implementation
 
       orb->register_value_factory (value2_factory->tao_repository_id (),
-                                   value2_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value2_factory);
       value2_factory->_remove_ref ();
 
       // Now perform the test. I don't check return values.
       // I just hope to get MARSHAL.
       OBV_FactoryTest::BaseValue_var base_value =
-        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_base_value ();
 
       OBV_FactoryTest::Value1_var value1 =
-        test->get_value1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_value1 ();
 
       OBV_FactoryTest::Value2_var value2 =
-        test->get_value2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_value2 ();
 
       // Test factories.
 
@@ -160,19 +146,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  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;
 }