diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index 5fbcf580337..1838c5b6dbf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -76,8 +76,7 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (void) TAO_Notify_Admin& parent = this->proxy_supplier_->consumer_admin (); CORBA::Boolean val = this->proxy_supplier_->check_filters (this->event_, parent.filter_admin (), - parent.filter_operator () - ACE_ENV_ARG_PARAMETER); + parent.filter_operator ()); if (TAO_debug_level > 1) ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val)); @@ -87,23 +86,22 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (void) return 0; } - ACE_TRY + try { TAO_Notify_Consumer* consumer = this->proxy_supplier_->consumer (); if (consumer != 0) { - consumer->deliver (this ACE_ENV_ARG_PARAMETER); + consumer->deliver (this); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { if (TAO_debug_level > 0) - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("TAO_Notify_Method_Request_Dispatch::: error sending event.\n ") - ); + ex._tao_print_exception ( + ACE_TEXT ( + "TAO_Notify_Method_Request_Dispatch::: error sending event.\n ")); } - ACE_ENDTRY; return 0; } @@ -113,8 +111,7 @@ TAO_Notify_Method_Request_Dispatch_Queueable * TAO_Notify_Method_Request_Dispatch::unmarshal ( TAO_Notify::Delivery_Request_Ptr & delivery_request, TAO_Notify_EventChannelFactory &ecf, - TAO_InputCDR & cdr - ACE_ENV_ARG_DECL) + TAO_InputCDR & cdr) { bool ok = true; TAO_Notify_Method_Request_Dispatch_Queueable * result = 0; @@ -142,7 +139,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal ( if (ok) { TAO_Notify_ProxySupplier* proxy_supplier = ecf.find_proxy_supplier (id_path, - 0 ACE_ENV_ARG_PARAMETER); + 0); if (proxy_supplier != 0) { if (DEBUG_LEVEL > 6) ACE_DEBUG ((LM_DEBUG, @@ -154,7 +151,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal ( } else { - TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (id_path, 0 ACE_ENV_ARG_PARAMETER); //@@todo + TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (id_path, 0); //@@todo if (proxy_consumer == 0) { ACE_ERROR ((LM_ERROR, |