diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Structured')
9 files changed, 16 insertions, 39 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp index c4df69993b1..fb514502662 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp @@ -22,11 +22,9 @@ CORBA::Object_ptr TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL) { CORBA::Object_var object = TAO_Notify_Proxy::activate (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Obtain our ref. - CORBA::Object_var obj = this->ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); + CORBA::Object_var obj = this->ref (); this->event_forwarder_ = Event_Forwarder::StructuredProxyPushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); @@ -46,7 +44,6 @@ TAO_Notify_RT_StructuredProxyPushSupplier::deliver (TAO_Notify_Method_Request_Di ACE_TRY { request.event()->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -65,7 +62,6 @@ TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_E ACE_TRY { event->push_no_filtering (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp index 86d312d8f4e..2a744e362ba 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp @@ -57,13 +57,12 @@ TAO_Notify_StructuredEvent_No_Copy::unmarshal (TAO_InputCDR & cdr) } TAO_Notify_Event * -TAO_Notify_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Notify_StructuredEvent_No_Copy::copy (void) const { TAO_Notify_Event * new_event; ACE_NEW_THROW_EX (new_event, TAO_Notify_StructuredEvent (*this->notification_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return new_event; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h index 5ed850afd93..54755fdb0a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h @@ -74,7 +74,7 @@ public: protected: /// returns a copy of this event allocated on the heap - virtual TAO_Notify_Event * copy (ACE_ENV_SINGLE_ARG_DECL) const; + virtual TAO_Notify_Event * copy (void) const; /// Structured Event const CosNotification::StructuredEvent* notification_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index d79e907a741..ca29e011545 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -30,7 +30,7 @@ TAO_Notify_StructuredProxyPushConsumer::release (void) } CosNotifyChannelAdmin::ProxyType -TAO_Notify_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_StructuredProxyPushConsumer::MyType (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -52,10 +52,8 @@ TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNot CORBA::NO_MEMORY ()); supplier->init (push_supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->connect (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER); + this->self_change (); } void @@ -80,15 +78,14 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica } void -TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (void) ACE_THROW_SPEC (( CORBA::SystemException )) { TAO_Notify_StructuredProxyPushConsumer::Ptr guard( this ); - this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER); + this->destroy (); + this->self_change (); } const char * @@ -108,20 +105,16 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - ACE_TRY_CHECK; CosNotifyComm::StructuredPushSupplier_var ps = CosNotifyComm::StructuredPushSupplier::_nil(); if ( ior.length() > 0 ) { CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ps = CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } // minor hack: suppress generating subscription updates during reload. bool save_updates = this->updates_off_; this->updates_off_ = true; this->connect_structured_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->updates_off_ = save_updates; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 82ec83de086..177c16bed68 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -56,7 +56,7 @@ public: protected: // = interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL) + virtual CosNotifyChannelAdmin::ProxyType MyType (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index 10e753f3437..6d71dcb8fbb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -29,7 +29,7 @@ TAO_Notify_StructuredProxyPushSupplier::release (void) } CosNotifyChannelAdmin::ProxyType -TAO_Notify_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_StructuredProxyPushSupplier::MyType (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -52,24 +52,21 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot CORBA::NO_MEMORY ()); consumer->init (push_consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->connect (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER); + this->self_change (); } void -TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (void) ACE_THROW_SPEC (( CORBA::SystemException )) { TAO_Notify_StructuredProxyPushSupplier::Ptr guard( this ); - this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER); + this->destroy (); + this->self_change (); } const char * @@ -93,12 +90,9 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a if (ior.length() > 0) { CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } this->connect_structured_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index b3a3526dbe9..0d6ef16902c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -62,7 +62,7 @@ public: /// = Servant methods // = interface methods - virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL) + virtual CosNotifyChannelAdmin::ProxyType MyType (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index 7739b12b707..48daf1a676e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -47,9 +47,8 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p ACE_TRY { - CosNotifyComm::StructuredPushConsumer_var new_push_consumer = + CosNotifyComm::StructuredPushConsumer_var new_push_consumer = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (new_push_consumer.in()); this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (new_push_consumer.in()); @@ -103,7 +102,6 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& //--cj end this->push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } /// Push a batch of events to this consumer. @@ -122,7 +120,6 @@ TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* TAO_Notify_StructuredPushConsumer* tmp = dynamic_cast<TAO_Notify_StructuredPushConsumer *> (old_consumer); ACE_ASSERT(tmp != 0); this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->schedule_timer(false); } @@ -135,7 +132,6 @@ TAO_Notify_StructuredPushConsumer::get_ior (void) const ACE_TRY { CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; result = static_cast<const char*> (ior.in ()); } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp index 69e28687a34..981911bb89f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp @@ -41,7 +41,6 @@ TAO_Notify_StructuredPushSupplier::get_ior (void) const ACE_TRY { CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; result = static_cast<const char*> (ior.in ()); } ACE_CATCHANY |