1 files changed, 12 insertions, 20 deletions

diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 06ddb75bf7b..a1971b10bdf 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -22,7 +22,7 @@ CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
 RtecEventChannelAdmin::EventChannel_ptr
-get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
+get_event_channel(int argc, ACE_TCHAR** argv)
 {
     FtRtecEventChannelAdmin::EventChannel_var channel;
     ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:nt:?"));
@@ -35,10 +35,8 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       {
       case 'i':
         {
-          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
-                                                        ACE_ENV_ARG_PARAMETER);
-          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-                                                                ACE_ENV_ARG_PARAMETER);
+          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ());
+          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
         }
         break;
       case 'n':
@@ -69,12 +67,10 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       name[0].id = CORBA::string_dup("FT_EventService");
 
       CosNaming::NamingContext_var naming_context =
-        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
-        ACE_ENV_ARG_PARAMETER);
+        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService");
 
       channel  = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
-        name
-        ACE_ENV_ARG_PARAMETER);
+        name);
     }
 
     if (use_gateway)
@@ -90,29 +86,26 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
 
 int main(int argc, ACE_TCHAR** argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    orb = CORBA::ORB_init(argc, argv, ""
-                          ACE_ENV_ARG_PARAMETER);
+  try{
+    orb = CORBA::ORB_init(argc, argv, "");
 
 
     RtecEventChannelAdmin::EventChannel_var channel
-      = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER);
+      = get_event_channel(argc, argv);
 
 
     if (CORBA::is_nil(channel.in()))
        return -1;
 
     PortableServer::POA_var poa =
-      resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
-                            ACE_ENV_ARG_PARAMETER);
+      resolve_init<PortableServer::POA>(orb.in(), "RootPOA");
 
     PortableServer::POAManager_var mgr = poa->the_POAManager();
 
     mgr->activate();
 
     PushSupplier_impl push_supplier(orb.in());
-    if (push_supplier.init(channel.in() ACE_ENV_ARG_PARAMETER) == -1)
+    if (push_supplier.init(channel.in()) == -1)
       return -1;
 
     RtecEventComm::PushSupplier_var
@@ -122,10 +115,9 @@ int main(int argc, ACE_TCHAR** argv)
     orb->run();
 
   }
-  ACE_CATCHANY {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+  catch (const CORBA::Exception& ex){
+      ex._tao_print_exception ("A CORBA Exception occurred.");
   }
-  ACE_ENDTRY;
 
 
   return 0;