1 files changed, 18 insertions, 33 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index eb633882bcc..9a06127d352 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -71,29 +71,25 @@ Consumer_Client::parse_args (int argc, char *argv[])
 static void
 create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                  CosNotifyChannelAdmin::EventChannel_ptr ec,
-                 Notify_Test_Client* client
-                 ACE_ENV_ARG_DECL)
+                 Notify_Test_Client* client)
 {
   ACE_NEW_THROW_EX (consumer,
     Notify_Push_Consumer ("Consumer", numEvents, consumerFilter,
       supplierFilter, *client),
     CORBA::NO_MEMORY ());
 
-  consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->init (client->root_poa ());
 
-  consumer->_connect (admin, ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->_connect (admin, ec);
 }
 
 int main (int argc, char * argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     if (status != 0)
     {
       ACE_ERROR((LM_ERROR, "Error: Unable to init consumer.\n"));
@@ -101,26 +97,23 @@ int main (int argc, char * argv[])
     }
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("Struct_Multi_Filter", 1 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("Struct_Multi_Filter", 1);
 
     CosNotifyChannelAdmin::AdminID adminid = 0;
     CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
       ec->new_for_consumers ((consumerFilter == OrOp
       ? CosNotifyChannelAdmin::OR_OP : CosNotifyChannelAdmin::AND_OP),
-      adminid ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      adminid);
 
     ACE_ASSERT(! CORBA::is_nil (consumer_admin.in ()));
 
     if (consumerFilter != None)
     {
       CosNotifyFilter::FilterFactory_var ffact =
-        ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ffact->create_filter (GRAMMAR);
 
       if (CORBA::is_nil (filter.in ()))
       {
@@ -135,8 +128,7 @@ int main (int argc, char * argv[])
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      filter->add_constraints (constraint_list);
 
       consumer_admin->add_filter (filter.in ());
     }
@@ -144,37 +136,30 @@ int main (int argc, char * argv[])
     CORBA::ORB_ptr orb = client.orb ();
 
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
-    create_consumer (consumer_admin.in (), ec.in (), &client ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_consumer (consumer_admin.in (), ec.in (), &client);
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n"));
 
-    sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
 
-    sig->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->done();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: Consumer:");
+    e._tao_print_exception ("\nError: Consumer:");
   }
-  ACE_ENDTRY;
 
   return 1;
 }