ChangeLogTag:Sun Jan 30 19:59:30 2000 Carlos O'Ryan <coryan@uci.edu>

1 files changed, 4 insertions, 18 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index a3a78c4dd26..e5ebc52546e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -67,25 +67,11 @@ TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event,
         ACE_const_cast(RtecEventComm::Event*, &e);
       RtecEventComm::EventSet single_event (1, 1, buffer, 0);
 
-      ACE_GUARD_THROW_EX (
-          TAO_EC_ConsumerAdmin::Busy_Lock,
-          ace_mon, consumer_admin->busy_lock (),
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-      ACE_CHECK;
-
-      TAO_EC_ConsumerAdmin::SupplierSetIterator end =
-        consumer_admin->end ();
+      TAO_EC_QOS_Info qos_info;
 
-      for (TAO_EC_ConsumerAdmin::SupplierSetIterator i =
-             consumer_admin->begin ();
-           i != end;
-           ++i)
-        {
-          TAO_EC_QOS_Info qos_info;
-
-          (*i)->filter (single_event, qos_info, ACE_TRY_ENV);
-          ACE_CHECK;
-        }
+      TAO_EC_Filter_Worker worker (single_event, qos_info);
+      consumer_admin->for_each (&worker, ACE_TRY_ENV);
+      ACE_CHECK;
     }
 }