1 files changed, 12 insertions, 24 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 42979b096e9..5b176e2aba8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -111,7 +111,7 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
 
@@ -121,8 +121,7 @@ int main (int argc, char *argv[])
       parse_args (argc, argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
@@ -133,9 +132,7 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
 
       Reactive_Strategy *reactive_strategy;
       ACE_NEW_RETURN (reactive_strategy,
@@ -148,12 +145,10 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::MMDevice_var mmdevice =
-        mmdevice_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        mmdevice_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (mmdevice.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -180,22 +175,17 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::FDev_var ping_fdev =
-        ping_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ping_fdev_impl->_this ();
       AVStreams::FDev_var pong_fdev =
-        pong_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        pong_fdev_impl->_this ();
 
-      mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mmdevice->add_fdev (ping_fdev.in ());
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          mmdevice->add_fdev (pong_fdev.in ());
         }
 
-      orb->run ( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      orb->run ( );
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
@@ -208,13 +198,11 @@ int main (int argc, char *argv[])
       send_latency.dump_results ("Send", gsf);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }