1 files changed, 9 insertions, 19 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
index 352ef42df08..963ddda3627 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
@@ -5,30 +5,24 @@ void
 Notify_Push_Supplier::_connect (
                 CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
-                bool useFilter
-                ACE_ENV_ARG_DECL)
+                bool useFilter)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxy_id_);
 
   if (useFilter)
     {
       CosNotifyFilter::FilterFactory_var ffact =
-        notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        notify_channel->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        ffact->create_filter ("TCL");
 
       ACE_ASSERT(! CORBA::is_nil (filter.in ()));
 
@@ -38,21 +32,17 @@ Notify_Push_Supplier::_connect (
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("group != 0");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      filter->add_constraints (constraint_list);
 
       proxyconsumer->add_filter (filter.in ());
     }
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
-      proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxyconsumer.in ());
 
-  this->proxy_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_structured_push_supplier (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }