1 files changed, 13 insertions, 30 deletions

diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index 2b020e6427c..52cfb6f4f75 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -36,14 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n"));
 
       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;
@@ -56,9 +55,7 @@ main (int argc, char *argv[])
                       1); // supplied by mapping
 
       orb->register_value_factory (va_factory->tao_repository_id (),
-                                   va_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   va_factory);
       va_factory->_remove_ref (); // release ownership
 
 
@@ -68,9 +65,7 @@ main (int argc, char *argv[])
                       1); // supplied by mapping
 
       orb->register_value_factory (vb_factory->tao_repository_id (),
-                                   vb_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   vb_factory);
       vb_factory->_remove_ref (); // release ownership
 
       // Do local test
@@ -134,12 +129,10 @@ main (int argc, char *argv[])
       // Now do remote test
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       OBV_AnyTest::Test_var test =
-        OBV_AnyTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        OBV_AnyTest::Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -152,9 +145,7 @@ main (int argc, char *argv[])
 
       // STEP 1.
       CORBA::Any_var result = test->get_something (
-          0
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          0);
 
       if (!(result.inout () >>= dst) || dst->id () != magic)
         {
@@ -166,9 +157,7 @@ main (int argc, char *argv[])
       // STEP 2.
       OBV_AnyTest::VB* dst_vb = 0;
       result = test->get_something (
-          1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          1);
 
       if (!(result.inout () >>= dst_vb) || dst_vb->id () != magic)
         {
@@ -197,9 +186,7 @@ main (int argc, char *argv[])
 
       // STEP 4. get a VB, but extract to a VA*.
       result = test->get_something (
-          1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          1);
 
       if (!(result.inout () >>= CORBA::Any::to_value(target.out())))
         {
@@ -216,21 +203,17 @@ main (int argc, char *argv[])
         }
 #endif /* TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING */
 
-      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_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client:");
+      ex._tao_print_exception ("Exception caught in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }