diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel')
39 files changed, 130 insertions, 319 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index 0bae38d051d..950a1fd3928 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -52,19 +52,15 @@ int AMI_Primary_Replication_Strategy::svc() int argc = 0; char** argv = 0; orb_ = CORBA::ORB_init (argc, argv); - ACE_TRY_CHECK; root_poa_ = resolve_init<PortableServer::POA>(orb_.in(), "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // create POAManager - mgr_ = root_poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + mgr_ = root_poa_->the_POAManager(); - mgr_->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + mgr_->activate(); PortableServer::IdUniquenessPolicy_var id_uniqueness_policy = root_poa_->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID @@ -78,7 +74,6 @@ int AMI_Primary_Replication_Strategy::svc() ); poa_ = create_persistent_poa(root_poa_, mgr_, "AMI_Update", policy_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; id_uniqueness_policy->destroy(); @@ -111,8 +106,7 @@ AMI_Primary_Replication_Strategy::replicate_request( bool success = false; FTRT::TransactionDepth transaction_depth = - Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + Request_Context_Repository().get_transaction_depth(); const FtRtecEventChannelAdmin::EventChannelList& backups = GroupInfoPublisher::instance()->backups(); @@ -130,7 +124,6 @@ AMI_Primary_Replication_Strategy::replicate_request( Request_Context_Repository().set_transaction_depth(0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; for (size_t i = 0; i < num_backups; ++i) { PortableServer::ObjectId oid; @@ -188,13 +181,11 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info, PortableServer::ObjectId_var oid = root_poa_->activate_object(&add_member_handler ACE_ENV_ARG_PARAMETER); - ACE_CHECK; TAO::Utils::Implicit_Deactivator deactivator(&add_member_handler); CORBA::Object_var obj = root_poa_->id_to_reference(oid.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; FTRT::AMI_ObjectGroupManagerHandler_var handler = FTRT::AMI_ObjectGroupManagerHandler::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); @@ -205,7 +196,6 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info, info, object_group_ref_version ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { add_member_handler.add_member_excep(0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp index 50a4a5f4dff..0c9e1260537 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -27,10 +27,9 @@ Basic_Replication_Strategy::~Basic_Replication_Strategy() } void -Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL) +Basic_Replication_Strategy::check_validity(void) { - FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(); TAO_FTRTEC::Log(1 , "check_validity : sequence no = %d\n", sequence_num_); @@ -60,7 +59,6 @@ void twoway_set_update(FtRtecEventChannelAdmin::EventChannel_var successor, do { ACE_TRY { successor->set_update(state ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH(CORBA::COMM_FAILURE, ex) { if (ex.minor() == 6) finished = false; @@ -68,7 +66,6 @@ void twoway_set_update(FtRtecEventChannelAdmin::EventChannel_var successor, ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } while(!finished); } @@ -83,8 +80,7 @@ Basic_Replication_Strategy::replicate_request( ACE_UNUSED_ARG(oid); FTRT::TransactionDepth transaction_depth = - Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + Request_Context_Repository().get_transaction_depth(); GroupInfoPublisherBase * info_publisher = GroupInfoPublisher::instance(); FtRtecEventChannelAdmin::EventChannel_var successor = info_publisher->successor(); @@ -95,10 +91,8 @@ Basic_Replication_Strategy::replicate_request( TAO_FTRTEC::Log(1, "replicate_request : sequence no = %d\n", sequence_num_); Request_Context_Repository().set_sequence_number(sequence_num_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Request_Context_Repository().set_transaction_depth(transaction_depth-1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (transaction_depth > 1) { twoway_set_update(successor, state ACE_ENV_ARG_PARAMETER); @@ -129,14 +123,12 @@ Basic_Replication_Strategy::add_member(const FTRT::ManagerInfo & info, do { ACE_TRY { successor->add_member(info, object_group_ref_version ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH(CORBA::COMM_FAILURE, ex) { if (ex.minor() == 6) finished = false; else ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } while (!finished); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h index 50b18dd95ee..e3aa138bdd1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h @@ -35,7 +35,7 @@ public: Basic_Replication_Strategy(bool mt); ~Basic_Replication_Strategy(); - virtual void check_validity(ACE_ENV_SINGLE_ARG_DECL); + virtual void check_validity(void); virtual void replicate_request(const FTRT::State& state, RollbackOperation rollback, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index 14ec7a5c533..10aba5e1554 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -29,19 +29,18 @@ TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void) RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_FTEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG,"obtain_push_supplier\n" )); - return obtain_proxy(ACE_ENV_SINGLE_ARG_PARAMETER); + return obtain_proxy(); } void TAO_FTEC_ConsumerAdmin::disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj) { ACE_TRY_NEW_ENV { - obj->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj->disconnect_push_supplier(); } ACE_CATCHALL { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h index 042172fc555..dbaf815d55e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -61,7 +61,7 @@ public: // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index a2e2b7a29cd..fb8cc2f66e3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -56,13 +56,11 @@ void setup_object_group(TAO_FTEC_Event_Channel* es, resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context, FTRTEC::Identification_Service::instance()->name() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG((LM_DEBUG, "Got Primary address from Naming Service\n")); primary->join_group(member_list[0] ACE_ENV_ARG_PARAMETER); } - ACE_CHECK; } } @@ -94,14 +92,12 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership Request_Context_Repository().init(orb_.in()); // get POAManager - PortableServer::POAManager_var mgr = poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + PortableServer::POAManager_var mgr = poa_->the_POAManager(); TAO::Utils::PolicyList_Destroyer policy_list(2); persistent_poa_ = create_persistent_poa(poa_, mgr, "FTEC_Persistant_POA", policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); // Activate the Event channel implementation @@ -129,12 +125,10 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership supplier_admin_object_id, consumer_admin_object_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); FtRtecEventChannelAdmin::EventChannel_var result; activate_object_with_id(result.out(), persistent_poa_.in(), this, object_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); setup_object_group(this, @@ -177,17 +171,17 @@ void TAO_FTEC_Event_Channel::oneway_set_update ( RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_FTEC_Event_Channel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +TAO_FTEC_Event_Channel::for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return ec_impl_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER); + return ec_impl_->for_consumers(); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_FTEC_Event_Channel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) +TAO_FTEC_Event_Channel::for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return ec_impl_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER); + return ec_impl_->for_suppliers(); } @@ -200,14 +194,13 @@ TAO_FTEC_Event_Channel::set_state (const FTRT::State & s ACE_ENV_ARG_DECL) } void -TAO_FTEC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_FTEC_Event_Channel::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (Fault_Detector::instance()) Fault_Detector::instance()->stop(); - ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec_impl_->destroy (); this->orb_->shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index 397aa0af43e..d2cb2269b98 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -64,14 +64,14 @@ public: /// RtecEventChannelAdmin::EventChannel Interface virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (ACE_ENV_SINGLE_ARG_DECL) + for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (ACE_ENV_SINGLE_ARG_DECL) + for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 0d85bbe8155..304d45891ba 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -25,7 +25,6 @@ void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, ACE_ENV_ARG_DECL) { ec->consumer_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void obtain_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, @@ -33,7 +32,6 @@ void obtain_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, ACE_ENV_ARG_DECL) { ec->supplier_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void obtain_push_consumer_and_connect(TAO_FTEC_Event_Channel_Impl* ec, @@ -45,21 +43,18 @@ void obtain_push_consumer_and_connect(TAO_FTEC_Event_Channel_Impl* ec, Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER); RtecEventChannelAdmin::ProxyPushConsumer_var consumer = - ec->supplier_admin()->obtain(ACE_ENV_SINGLE_ARG_PARAMETER); + ec->supplier_admin()->obtain(); - ACE_CHECK; ACE_TRY { consumer->connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { ec->supplier_admin()->disconnect(consumer.in()); ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } @@ -68,7 +63,6 @@ void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, ACE_ENV_ARG_DECL) { PortableServer::POA_var poa= ec->supplier_poa(); - ACE_CHECK; FtRtecEventChannelAdmin::Connect_push_supplier_param& param = op.param.connect_supplier_param(); @@ -87,7 +81,6 @@ void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, param.qos ACE_ENV_ARG_PARAMETER); } - ACE_CHECK; } void obtain_push_supplier_and_connect(TAO_FTEC_Event_Channel_Impl* ec, @@ -99,21 +92,18 @@ void obtain_push_supplier_and_connect(TAO_FTEC_Event_Channel_Impl* ec, Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER); RtecEventChannelAdmin::ProxyPushSupplier_var supplier = - ec->consumer_admin()->obtain(ACE_ENV_SINGLE_ARG_PARAMETER); + ec->consumer_admin()->obtain(); - ACE_CHECK; ACE_TRY { supplier->connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { ec->consumer_admin()->disconnect(supplier.in()); ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } @@ -122,7 +112,6 @@ void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, ACE_ENV_ARG_DECL) { PortableServer::POA_var poa= ec->consumer_poa(); - ACE_CHECK; FtRtecEventChannelAdmin::Connect_push_consumer_param& param = op.param.connect_consumer_param(); @@ -140,7 +129,6 @@ void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, param.qos ACE_ENV_ARG_PARAMETER); } - ACE_CHECK; } void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, @@ -148,7 +136,6 @@ void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, ACE_ENV_ARG_DECL) { PortableServer::POA_var poa= ec->consumer_poa(); - ACE_CHECK; TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id); @@ -156,9 +143,7 @@ void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, if (proxy == NULL) // proxy not found ACE_THROW(FTRT::InvalidUpdate()); - ACE_CHECK; - proxy->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + proxy->disconnect_push_supplier(); } void disconnect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, @@ -166,16 +151,13 @@ void disconnect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, ACE_ENV_ARG_DECL) { PortableServer::POA_var poa= ec->supplier_poa(); - ACE_CHECK; TAO_FTEC_ProxyPushConsumer* proxy = ec->find_proxy_push_consumer(op.object_id); if (proxy == NULL) // proxy not found ACE_THROW(FTRT::InvalidUpdate()); - ACE_CHECK; - proxy->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + proxy->disconnect_push_consumer(); } @@ -184,7 +166,6 @@ void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec, ACE_ENV_ARG_DECL) { PortableServer::POA_var poa= ec->consumer_poa(); - ACE_CHECK; TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id); @@ -192,9 +173,7 @@ void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec, if (proxy == NULL) // proxy not found ACE_THROW(FTRT::InvalidUpdate()); - ACE_CHECK; - proxy->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + proxy->suspend_connection(); } void resume_connection(TAO_FTEC_Event_Channel_Impl* ec, @@ -207,9 +186,7 @@ void resume_connection(TAO_FTEC_Event_Channel_Impl* ec, if (proxy == NULL) // proxy not found ACE_THROW(FTRT::InvalidUpdate()); - ACE_CHECK; - proxy->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + proxy->resume_connection(); } @@ -262,28 +239,24 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( { iogr_maker_.init(orb.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - TAO_EC_Event_Channel_Base::activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + TAO_EC_Event_Channel_Base::activate(); supplier_admin()->activate(supplier_admin_oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_admin()->activate(consumer_admin_oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // = The RtecEventChannelAdmin::EventChannel methods... /// The default implementation is: -/// this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); +/// this->consumer_admin ()->_this (); RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_FTEC_Event_Channel_Impl::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +TAO_FTEC_Event_Channel_Impl::for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Object_var obj = consumer_admin()->reference(ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var obj = consumer_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in() ACE_ENV_ARG_PARAMETER); return RtecEventChannelAdmin::ConsumerAdmin::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); @@ -291,12 +264,12 @@ ACE_THROW_SPEC ((CORBA::SystemException)) /// The default implementation is: -/// this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); +/// this->supplier_admin ()->_this (); RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_FTEC_Event_Channel_Impl::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) +TAO_FTEC_Event_Channel_Impl::for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Object_var obj = supplier_admin()->reference(ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var obj = supplier_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in() ACE_ENV_ARG_PARAMETER); return RtecEventChannelAdmin::SupplierAdmin::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); @@ -311,8 +284,7 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer ( ) { CORBA::Any_var any - = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + = Request_Context_Repository().get_cached_result(); FtRtecEventChannelAdmin::ObjectId *oid; @@ -337,7 +309,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer ( qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); return object_id._retn(); } @@ -351,8 +322,7 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier ( ) { CORBA::Any_var any - = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + = Request_Context_Repository().get_cached_result(); FtRtecEventChannelAdmin::ObjectId *oid; @@ -376,7 +346,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier ( qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); return object_id._retn(); @@ -395,9 +364,7 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_supplier ( if (proxy == NULL) // proxy not found return; - ACE_CHECK; - proxy->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + proxy->disconnect_push_supplier(); } void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer ( @@ -413,9 +380,7 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer ( if (proxy == NULL) // proxy not found return; - ACE_CHECK; - proxy->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + proxy->disconnect_push_consumer(); } void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier ( @@ -431,9 +396,7 @@ void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier ( if (proxy == NULL) // proxy not found ACE_THROW(FtRtecEventComm::InvalidObjectID()); - ACE_CHECK; - proxy->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + proxy->suspend_connection(); } @@ -450,9 +413,7 @@ void TAO_FTEC_Event_Channel_Impl::resume_push_supplier ( if (proxy == NULL) // proxy not found ACE_THROW(FtRtecEventComm::InvalidObjectID()); - ACE_CHECK; - proxy->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + proxy->resume_connection(); } void TAO_FTEC_Event_Channel_Impl::push ( @@ -479,9 +440,7 @@ void TAO_FTEC_Event_Channel_Impl::get_state ( { FtEventServiceInterceptor::instance()->get_state(state.cached_operation_results); this->supplier_admin()->get_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->consumer_admin()->get_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -496,9 +455,7 @@ void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat FtEventServiceInterceptor::instance()->set_state(state.cached_operation_results); this->supplier_admin()->set_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->consumer_admin()->set_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -506,7 +463,7 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate)) { - FTRTEC::Replication_Service::instance()->check_validity(ACE_ENV_SINGLE_ARG_PARAMETER); + FTRTEC::Replication_Service::instance()->check_validity(); if (!Request_Context_Repository().is_executed_request()) { Safe_InputCDR cdr((const char*)s.get_buffer(), s.length()); @@ -517,7 +474,6 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s } (update_table[op->param._d()])(this, *op ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -545,7 +501,6 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_supplier(const FtRtecEventChannelAd const PortableServer::Servant servant = poa->id_to_servant( reinterpret_cast<const PortableServer::ObjectId&> (id) ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr obj = dynamic_cast<POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr> (servant); @@ -566,7 +521,6 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAd const PortableServer::Servant servant = poa->id_to_servant( reinterpret_cast<const PortableServer::ObjectId&> (id) ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr obj = dynamic_cast<POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr> (servant); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h index ba6c2e1bc0d..7f7226ca87c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -50,12 +50,12 @@ public: // = The RtecEventChannelAdmin::EventChannel methods... virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (ACE_ENV_SINGLE_ARG_DECL) + for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (ACE_ENV_SINGLE_ARG_DECL) + for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)); void get_state (FtRtecEventChannelAdmin::EventChannelState & s diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index 80c7ba30a06..b5cd7784f55 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -85,11 +85,10 @@ void TAO_FTEC_Group_Manager::create_group ( GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance(); GroupInfoPublisherBase::Info_ptr info ( - publisher->setup_info(impl_->info_list, + publisher->setup_info(impl_->info_list, impl_->my_position, object_group_ref_version ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; publisher->update_info(info); @@ -109,7 +108,6 @@ void TAO_FTEC_Group_Manager::create_group ( if (!CORBA::is_nil(successor.in())) { successor->create_group(info_list, object_group_ref_version ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -146,11 +144,10 @@ void TAO_FTEC_Group_Manager::add_member ( GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance(); GroupInfoPublisherBase::Info_ptr group_info ( - publisher->setup_info(new_impl->info_list, + publisher->setup_info(new_impl->info_list, new_impl->my_position, object_group_ref_version ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; int last_one = (impl_->my_position == impl_->info_list.length()-1); @@ -178,13 +175,11 @@ void TAO_FTEC_Group_Manager::add_member ( new_impl->my_position, object_group_ref_version ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; ACE_AUTO_PTR_RESET(group_info, group_info1.release(), GroupInfoPublisherBase::Info); last_one = true; } ACE_ENDTRY; - ACE_CHECK; } if (last_one) @@ -240,11 +235,9 @@ void TAO_FTEC_Group_Manager::add_member ( TAO_FTRTEC::Log(2, "Setting state\n"); info.ior->set_state(s ACE_ENV_ARG_PARAMETER); - ACE_CHECK; info.ior->create_group(new_impl->info_list, object_group_ref_version ACE_ENV_ARG_PARAMETER); - ACE_CHECK; TAO_FTRTEC::Log(2, "After create_group\n"); } @@ -296,11 +289,10 @@ void TAO_FTEC_Group_Manager::remove_member ( GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance(); GroupInfoPublisherBase::Info_ptr info ( - publisher->setup_info(impl_->info_list, + publisher->setup_info(impl_->info_list, impl_->my_position, object_group_ref_version ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; publisher->update_info(info); FtRtecEventChannelAdmin::EventChannel_var successor = @@ -312,7 +304,6 @@ void TAO_FTEC_Group_Manager::remove_member ( successor->remove_member(crashed_location, object_group_ref_version ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 410377e8a80..cf88341d153 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -29,7 +29,6 @@ FTEC_ORBInitializer::post_init ( { Request_Context_Repository().allocate_slots(info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor; PortableInterceptor::ClientRequestInterceptor_ptr ctmp; @@ -37,13 +36,11 @@ FTEC_ORBInitializer::post_init ( ACE_NEW_THROW_EX(ctmp, TAO_Set_Update_Interceptor, CORBA::NO_MEMORY()); - ACE_CHECK; client_interceptor = ctmp; info->add_client_request_interceptor (client_interceptor.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor; PortableInterceptor::ServerRequestInterceptor_ptr stmp; @@ -55,7 +52,6 @@ FTEC_ORBInitializer::post_init ( info->add_server_request_interceptor (server_interceptor.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX(stmp, FtEventServiceInterceptor, CORBA::NO_MEMORY()); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp index 3f489f9540f..fdb274cb34c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -37,12 +37,9 @@ TAO_FTEC_ProxyPushConsumer::activate ( { result = RtecEventChannelAdmin::ProxyPushConsumer::_nil(); ACE_TRY { - object_id_ = Request_Context_Repository().get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - PortableServer::POA_var poa = _default_POA(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + object_id_ = Request_Context_Repository().get_object_id(); + PortableServer::POA_var poa = _default_POA(); activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -71,7 +68,6 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( update.param.connect_supplier_param(param); Inherited::connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); @@ -80,17 +76,15 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( svc->replicate_request(update, &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { - this->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_push_consumer(); ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } -void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) @@ -99,14 +93,12 @@ void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DE update.object_id = id(); update.param._d(FtRtecEventChannelAdmin::DISCONNECT_PUSH_CONSUMER); - Inherited::disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + Inherited::disconnect_push_consumer(); FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc); svc->replicate_request(update, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void TAO_FTEC_ProxyPushConsumer::get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index 518e4f73eb0..205fdf5fd7d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -46,7 +46,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); const FtRtecEventChannelAdmin::ObjectId& id() const; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index 62fad4ef9d7..61b80fd1439 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -38,12 +38,9 @@ TAO_FTEC_ProxyPushSupplier::activate ( result = RtecEventChannelAdmin::ProxyPushSupplier::_nil(); ACE_TRY { - object_id_ = Request_Context_Repository().get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - PortableServer::POA_var poa = _default_POA(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + object_id_ = Request_Context_Repository().get_object_id(); + PortableServer::POA_var poa = _default_POA(); activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -72,7 +69,6 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( update.param.connect_consumer_param(param); Inherited::connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); @@ -82,7 +78,6 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( svc->replicate_request(update, &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { } @@ -90,7 +85,7 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( } -void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) @@ -100,18 +95,16 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DE update.object_id = id(); update.param._d(FtRtecEventChannelAdmin::DISCONNECT_PUSH_SUPPLIER); - Inherited::disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + Inherited::disconnect_push_supplier(); FTRTEC::Replication_Service *svc = FTRTEC::Replication_Service::instance(); ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc); svc->replicate_request(update, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } -void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL) +void TAO_FTEC_ProxyPushSupplier::suspend_connection (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) @@ -121,8 +114,7 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL) update.object_id = id(); update.param._d(FtRtecEventChannelAdmin::SUSPEND_CONNECTION); - Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + Inherited::suspend_connection(); ACE_TRY { @@ -132,16 +124,15 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL) svc->replicate_request(update, &FtRtecEventChannelAdmin::EventChannelFacade::resume_push_supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { - this->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER); + this->resume_connection(); ACE_RE_THROW; } ACE_ENDTRY; } -void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL) +void TAO_FTEC_ProxyPushSupplier::resume_connection (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) @@ -152,8 +143,7 @@ void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL) update.object_id = id(); update.param._d(FtRtecEventChannelAdmin::RESUME_CONNECTION); - Inherited::resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + Inherited::resume_connection(); ACE_TRY { FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); @@ -163,10 +153,9 @@ void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL) svc->replicate_request(update, &FtRtecEventChannelAdmin::EventChannelFacade::suspend_push_supplier ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { - this->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER); + this->suspend_connection(); ACE_RE_THROW; } ACE_ENDTRY; @@ -195,7 +184,7 @@ void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyP state.parameter.info().qos ACE_ENV_ARG_PARAMETER); if (state.suspended) - Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER); + Inherited::suspend_connection(); } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index 34c38f96400..67ac4929f26 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -46,11 +46,11 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL) + virtual void suspend_connection (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL) + virtual void resume_connection (void) ACE_THROW_SPEC ((CORBA::SystemException)); const FtRtecEventChannelAdmin::ObjectId& id() const; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index 74a666746cc..ffc32da67d3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -27,18 +27,17 @@ TAO_FTEC_SupplierAdmin::~TAO_FTEC_SupplierAdmin() RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_FTEC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_FTEC_SupplierAdmin::obtain_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return obtain_proxy(ACE_ENV_SINGLE_ARG_PARAMETER); + return obtain_proxy(); } void TAO_FTEC_SupplierAdmin::disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj) { ACE_TRY_NEW_ENV { - obj->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj->disconnect_push_consumer(); } ACE_CATCHALL { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index 814061c0263..cd1e66b26ac 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -67,7 +67,7 @@ public: // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index 5fb7d08ad06..f05e8c534a8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -27,23 +27,22 @@ FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid ACE_ENV_ARG_DECL) { poa_->activate_object_with_id( - reinterpret_cast<const PortableServer::ObjectId&> (oid), + reinterpret_cast<const PortableServer::ObjectId&> (oid), servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; object_id_ = oid; } const FtRtecEventComm::ObjectId& -FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const +FT_ProxyAdmin_Base::object_id(void) const { return object_id_; } CORBA::Object_var -FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const +FT_ProxyAdmin_Base::reference(void) const { return poa_->servant_to_reference(servant_ ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h index 2c639c0ce6f..cc0eca54ce0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -33,10 +33,10 @@ public: void activate(const FtRtecEventComm::ObjectId& oid ACE_ENV_ARG_DECL); - const FtRtecEventComm::ObjectId& object_id(ACE_ENV_SINGLE_ARG_DECL) const; + const FtRtecEventComm::ObjectId& object_id(void) const; /// Returns an CORBA object reference when the servant is activated - CORBA::Object_var reference(ACE_ENV_SINGLE_ARG_DECL) const; + CORBA::Object_var reference(void) const; protected: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp index 188bdcab7e8..303724cf69d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp @@ -26,8 +26,7 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy ( ACE_ENV_ARG_PARAMETER); ProxyInterface_var result - = admin_->obtain(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + = admin_->obtain(); FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_TRY { @@ -36,23 +35,20 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy ( svc->replicate_request(op, Proxy::rollback_obtain ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { admin_->disconnect(result.in()); ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } template <class EC_PROXY_ADMIN, class Proxy, class ProxyInterface, class State> typename FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::ProxyInterface_ptr -FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_ENV_SINGLE_ARG_DECL) +FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (void) { - CORBA::Any_var any = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + CORBA::Any_var any = Request_Context_Repository().get_cached_result(); CORBA::Object_var obj; if (any >>= CORBA::Any::to_object(obj)) @@ -61,7 +57,6 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_E FtRtecEventChannelAdmin::ObjectId oid; Request_Context_Repository().generate_object_id(oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); FtRtecEventChannelAdmin::Operation update; @@ -69,23 +64,19 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_E update.param._d(EC_PROXY_ADMIN::OBTAIN_ID); ProxyInterface_var result - = admin_->obtain(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + = admin_->obtain(); ACE_TRY { FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc); obj = IOGR_Maker::instance()->forge_iogr(result.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; result = ProxyInterface::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; svc->replicate_request(update, Proxy::rollback_obtain ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { admin_->disconnect(result.in()); @@ -105,7 +96,6 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::get_state( { typename EC_PROXY_ADMIN::StateWorker worker(state.proxies); admin_->for_each(&worker ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } template <class EC_PROXY_ADMIN, class Proxy, @@ -121,26 +111,21 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state( Request_Context_Repository().set_object_id(proxy_state.object_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ProxyInterface_var - proxy_ior = admin_->obtain(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + proxy_ior = admin_->obtain(); typedef typename Proxy::Skeleton Skeleton; const void *temp = &proxy_state.object_id; const PortableServer::ObjectId *oid = reinterpret_cast<const PortableServer::ObjectId *> (temp); - const PortableServer::Servant servant = + const PortableServer::Servant servant = poa_->id_to_servant (*oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Skeleton skeleton = dynamic_cast<Skeleton> (servant); - ACE_CHECK; static_cast<Proxy*> (skeleton)->set_state(proxy_state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h index 92e2bf0ad6d..f574107851f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h @@ -33,7 +33,7 @@ public: FT_ProxyAdmin(EC_PROXY_ADMIN* admin, PortableServer::POA_var poa); - ProxyInterface_ptr obtain_proxy (ACE_ENV_SINGLE_ARG_DECL); + ProxyInterface_ptr obtain_proxy (void); /// this is used for updating the state void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index ee750df8f22..5495a55f324 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -22,38 +22,31 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL) { - CORBA::String_var orb_id = ri->orb_id(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); + CORBA::String_var orb_id = ri->orb_id(); int argc =0; char** argv =0; CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, orb_id.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); PortableServer::POA_var poa = resolve_init<PortableServer::POA>(orb.in(), "RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); PortableInterceptor::AdapterName_var adaptor_name = - ri->adapter_name(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); + ri->adapter_name(); for (size_t i = 1; i < adaptor_name->length(); ++i) { poa = poa->find_POA((*adaptor_name)[i] , false ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); } CORBA::OctetSeq_var oid = - ri->object_id(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); + ri->object_id(); CORBA::Object_var obj = poa->id_to_reference(oid.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); return obj._retn(); } @@ -63,11 +56,9 @@ CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri { CORBA::Object_var target = get_target(ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); TAO::ObjectKey_var key = - target->_key(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); + target->_key(); CORBA::Object_var iogr = GroupInfoPublisher::instance()->group_reference(); @@ -75,7 +66,6 @@ CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri CORBA::Object_var forward = IOGR_Maker::instance()->ior_replace_key(iogr.in(), key.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); return forward._retn(); } @@ -89,13 +79,13 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor() { } -char * ForwardCtrlServerInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +char * ForwardCtrlServerInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup("ForwardCtrlServerInterceptor"); } -void ForwardCtrlServerInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void ForwardCtrlServerInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -109,14 +99,12 @@ void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerR IOP::ServiceContext_var service_context = ri->get_request_service_context(IOP::FT_GROUP_VERSION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { // not an FT call , continue to process the request return; } ACE_ENDTRY; - ACE_CHECK; GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance(); if (!publisher->is_primary()) { @@ -169,7 +157,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques ACE_TRY_EX(block1) { - if (!ri->response_expected(ACE_ENV_SINGLE_ARG_PARAMETER)) + if (!ri->response_expected()) return; ACE_TRY_CHECK_EX(block1); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h index d53dc682b0e..9690d1ffc67 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h @@ -28,10 +28,10 @@ public: ForwardCtrlServerInterceptor(); ~ForwardCtrlServerInterceptor(); - virtual char * name (ACE_ENV_SINGLE_ARG_DECL) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 779396ce1ee..7caca5d3fbf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -85,7 +85,6 @@ retrieve_ft_request_context( ACE_ENV_ARG_DECL) { service_context = ri->get_request_service_context(IOP::FT_REQUEST ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char * buf = reinterpret_cast<const char *> (service_context->context_data.get_buffer ()); @@ -115,7 +114,6 @@ get_transaction_depth_context( ACE_TRY { service_context = ri->get_request_service_context(FTRT::FT_TRANSACTION_DEPTH ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_PARAM, ex) { @@ -152,7 +150,6 @@ get_sequence_number_context( IOP::ServiceContext_var service_context; service_context = ri->get_request_service_context(FTRT::FT_SEQUENCE_NUMBER ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); const char * buf = reinterpret_cast<const char *> (service_context->context_data.get_buffer ()); @@ -193,14 +190,14 @@ FtEventServiceInterceptor::instance() } char * -FtEventServiceInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FtEventServiceInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FtEventServiceInterceptor"); } void -FtEventServiceInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FtEventServiceInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -221,8 +218,7 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); if (ACE_OS::strcmp(operation.in(), "push") == 0) { TAO_FTRTEC::Log(3, "Received push command\n"); return; @@ -295,7 +291,6 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt service_context, ft_request_service_context ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_PARAM, ex) { return; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index 09a28a81257..80beac8a655 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -54,10 +54,10 @@ public: ~FtEventServiceInterceptor(); static FtEventServiceInterceptor* instance(); - virtual char * name (ACE_ENV_SINGLE_ARG_DECL) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 63d7801689e..165ea3115a0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -87,12 +87,10 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, CORBA::Object_var obj = IOGR_Maker::instance()->make_iogr(iors,object_group_ref_version ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); result->iogr = ::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); ACE_DEBUG((LM_DEBUG, "In setup_info\n")); //log_obj_endpoints(result->iogr.in()); @@ -109,12 +107,10 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, obj = IOGR_Maker::instance()->merge_iors(iors ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); result->successor = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); } /* else { @@ -137,7 +133,6 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, ACE_ENV_ARG_PARAMETER); //CORBA::PolicyList_var pols; //result->backups[i]->_validate_connection (pols.out ()); - ACE_CHECK_RETURN(0); } return result.release(); } @@ -157,7 +152,6 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) ACE_TRY_NEW_ENV { naming_context_->rebind(FTRTEC::Identification_Service::instance()->name(), info->iogr.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHALL { /// there's nothing we can do if the naming service is down diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index e64501e5e18..1c9a6e40988 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -64,7 +64,6 @@ IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list, { /// generate a new IOGR if the object group changes. CORBA::Object_var obj = merge_iors(list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); FT::TagFTGroupTaggedComponent ft_tag_component(ft_tag_component_); /// the generated IOGR should use a new object_group_ref_version @@ -72,7 +71,6 @@ IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list, set_tag_components(obj.in(), list[0], ft_tag_component ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); return obj._retn(); } @@ -93,11 +91,10 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj FtRtecEventChannelAdmin::EventChannel_var successor = GroupInfoPublisher::instance()->successor(); if (! CORBA::is_nil(successor.in())) { - TAO::ObjectKey_var newkey = obj->_key(ACE_ENV_SINGLE_ARG_PARAMETER); + TAO::ObjectKey_var newkey = obj->_key(); CORBA::Object_var new_base = ior_replace_key(successor.in(), newkey.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil()); if (CORBA::is_nil( new_base.in() )) return CORBA::Object::_nil(); @@ -109,7 +106,6 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj TAO_Stub *stub = orb_core->create_stub (CORBA::string_dup(obj->_stubobj ()->type_id.in ()), // give the id string base_profiles ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Make the stub memory allocation exception safe for the duration // of this method. @@ -129,7 +125,6 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj merged = iorm_->add_profiles(obj, temp_obj ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); } else merged = CORBA::Object::_duplicate(obj); @@ -137,7 +132,6 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj set_tag_components(merged.in(), obj, ft_tag_component_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil ()); return merged._retn(); } @@ -155,8 +149,7 @@ IOGR_Maker::ior_replace_key(CORBA::Object_ptr obj, ACE_CDR::consolidate(&mb, out_cdr.begin()); - TAO::ObjectKey_var old_key = obj->_key(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(CORBA::Object::_nil ()); + TAO::ObjectKey_var old_key = obj->_key(); replace_key(mb.base(), mb.end(), old_key.in(), key); @@ -242,7 +235,7 @@ IOGR_Maker::get_ref_version() const void IOGR_Maker::set_tag_components( - CORBA::Object_ptr merged, + CORBA::Object_ptr merged, CORBA::Object_ptr primary, FT::TagFTGroupTaggedComponent& ft_tag_component ACE_ENV_ARG_DECL) @@ -253,11 +246,9 @@ IOGR_Maker::set_tag_components( prop.remove_primary_tag(merged ACE_ENV_ARG_PARAMETER); - ACE_CHECK; iorm_->set_primary (&prop, merged, primary ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Set the property iorm_->set_property (&prop, merged diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp index fbb8c4166a4..d6a5a0ac5a4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp @@ -26,7 +26,7 @@ ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder * { } -void ObjectGroupManagerHandler::create_group (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void ObjectGroupManagerHandler::create_group (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,7 +40,7 @@ ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder * } void -ObjectGroupManagerHandler::add_member (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ObjectGroupManagerHandler::add_member (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (--num_backups_ ==0) @@ -52,11 +52,11 @@ ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder * ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->add_member(ACE_ENV_SINGLE_ARG_PARAMETER); + this->add_member(); } void -ObjectGroupManagerHandler::set_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ObjectGroupManagerHandler::set_state (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index 8a3938a6c65..bdff8796543 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -31,21 +31,21 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void create_group (ACE_ENV_SINGLE_ARG_DECL) + virtual void create_group (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void add_member (ACE_ENV_SINGLE_ARG_DECL) + virtual void add_member (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void set_state (ACE_ENV_SINGLE_ARG_DECL) + virtual void set_state (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index 753cd359248..d6ff22f60fe 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -87,12 +87,10 @@ namespace FTRTEC ACE_NEW_THROW_EX (temp_orb_initializer, FTEC_ORBInitializer, CORBA::NO_MEMORY ()); - ACE_TRY_CHECK; orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -120,9 +118,9 @@ namespace FTRTEC } } - void Replication_Service::check_validity(ACE_ENV_SINGLE_ARG_DECL) + void Replication_Service::check_validity(void) { - replication_strategy->check_validity(ACE_ENV_SINGLE_ARG_PARAMETER); + replication_strategy->check_validity(); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h index e1deca2f103..b6763393a01 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h @@ -45,7 +45,7 @@ namespace FTRTEC /** * Used for checking if the incoming replication message is out of sequence. */ - void check_validity(ACE_ENV_SINGLE_ARG_DECL); + void check_validity(void); typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation) (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp index f7cc5f524f7..db6c4497c52 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp @@ -21,7 +21,7 @@ Replication_Strategy::~Replication_Strategy() void -Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Replication_Strategy::check_validity(void) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h index 8c661ee0ee8..289cd2a337b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -37,7 +37,7 @@ public: * used for basic replication strategy. It throws FTRT::OutOfSequence when the * incoming request is not valid. */ - virtual void check_validity(ACE_ENV_SINGLE_ARG_DECL); + virtual void check_validity(void); typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation) (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index f04af729152..2ba591d172e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -30,11 +30,11 @@ void Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL) { - object_id_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER); - cached_result_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER); - seq_num_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER); - ft_request_service_context_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER); - transaction_depth_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER); + object_id_slot = info->allocate_slot_id(); + cached_result_slot = info->allocate_slot_id(); + seq_num_slot = info->allocate_slot_id(); + ft_request_service_context_slot = info->allocate_slot_id(); + transaction_depth_slot = info->allocate_slot_id(); } void @@ -51,7 +51,6 @@ void Request_Context_Repository::generate_object_id( UUID::create(oid.get_buffer()); set_object_id(oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -63,14 +62,12 @@ Request_Context_Repository::set_object_id( PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Any a; a <<= object_id; pic->set_slot(object_id_slot, a ACE_ENV_ARG_PARAMETER); - ACE_CHECK; */ *oid = object_id; } @@ -95,17 +92,15 @@ get_object_id(CORBA::Any_var a FtRtecEventChannelAdmin::ObjectId_var -Request_Context_Repository::get_object_id(ACE_ENV_SINGLE_ARG_DECL) +Request_Context_Repository::get_object_id(void) { /* PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var()); CORBA::Any_var a = pic->get_slot(object_id_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var()); return ::get_object_id(a ACE_ENV_ARG_PARAMETER); @@ -124,7 +119,6 @@ Request_Context_Repository::get_object_id( { CORBA::Any_var a = ri->get_slot(object_id_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var()); return ::get_object_id(a ACE_ENV_ARG_PARAMETER); @@ -142,27 +136,23 @@ Request_Context_Repository::set_cached_result( } CORBA::Any_ptr -Request_Context_Repository::get_cached_result(ACE_ENV_SINGLE_ARG_DECL) +Request_Context_Repository::get_cached_result(void) { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); CORBA::Any_var a = pic->get_slot(cached_result_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); return a._retn(); } bool Request_Context_Repository::is_executed_request() { ACE_TRY_NEW_ENV { - CORBA::Any_var any = get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var any = get_cached_result(); CORBA::TypeCode_var type = any->type(); - CORBA::TCKind const kind = type->kind(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::TCKind const kind = type->kind(); return kind != CORBA::tk_null; } ACE_CATCHALL { @@ -192,7 +182,6 @@ Request_Context_Repository::set_sequence_number( PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Any a; @@ -203,14 +192,12 @@ Request_Context_Repository::set_sequence_number( FTRT::SequenceNumber -Request_Context_Repository::get_sequence_number(ACE_ENV_SINGLE_ARG_DECL) +Request_Context_Repository::get_sequence_number(void) { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); CORBA::Any_var a = pic->get_slot(seq_num_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); FTRT::SequenceNumber result = 0; a >>= result; return result; @@ -222,7 +209,6 @@ Request_Context_Repository::get_sequence_number( ACE_ENV_ARG_DECL) { CORBA::Any_var a = ri->get_slot(seq_num_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); FTRT::SequenceNumber result = 0; a >>= result; return result; @@ -259,7 +245,6 @@ Request_Context_Repository::set_transaction_depth( a <<= depth; ri->set_slot(transaction_depth_slot,a ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -270,13 +255,11 @@ Request_Context_Repository::set_transaction_depth( PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Any a; a <<= depth; pic->set_slot(transaction_depth_slot,a ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -287,7 +270,6 @@ Request_Context_Repository::get_transaction_depth( { CORBA::Any_var a = ri->get_slot(transaction_depth_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); FTRT::TransactionDepth result=0; a >>= result; return result; @@ -301,11 +283,9 @@ Request_Context_Repository::get_transaction_depth( PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); CORBA::Any_var a = pic->get_slot(transaction_depth_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); FTRT::TransactionDepth result=0; a >>= result; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h index 542f58937ea..ed33ceecfb7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -62,7 +62,7 @@ public: ACE_ENV_ARG_DECL); void set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id ACE_ENV_ARG_DECL); - FtRtecEventChannelAdmin::ObjectId_var get_object_id(ACE_ENV_SINGLE_ARG_DECL); + FtRtecEventChannelAdmin::ObjectId_var get_object_id(void); FtRtecEventChannelAdmin::ObjectId_var get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL); @@ -71,7 +71,7 @@ public: const CORBA::Any& result ACE_ENV_ARG_DECL); - CORBA::Any_ptr get_cached_result(ACE_ENV_SINGLE_ARG_DECL); + CORBA::Any_ptr get_cached_result(void); bool is_executed_request(); void set_sequence_number(PortableInterceptor::ServerRequestInfo_ptr ri, @@ -83,7 +83,7 @@ public: FTRT::SequenceNumber get_sequence_number(PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL); - FTRT::SequenceNumber get_sequence_number(ACE_ENV_SINGLE_ARG_DECL); + FTRT::SequenceNumber get_sequence_number(void); void set_ft_request_service_context( PortableInterceptor::ServerRequestInfo_ptr ri, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 58e96befd06..6f8af93e08b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -21,14 +21,14 @@ TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor (void) } char * -TAO_Set_Update_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Set_Update_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -TAO_Set_Update_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Set_Update_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -49,14 +49,12 @@ TAO_Set_Update_Interceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); if (strcmp(operation.in(), "set_update")==0 || strcmp(operation.in(), "oneway_set_update") ==0) { CORBA::Any_var a = Request_Context_Repository().get_ft_request_service_context(ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; IOP::ServiceContext* sc; @@ -64,7 +62,6 @@ TAO_Set_Update_Interceptor::send_request ( return; ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; FTRT::TransactionDepth transaction_depth = Request_Context_Repository().get_transaction_depth(ri ACE_ENV_ARG_PARAMETER); @@ -98,7 +95,6 @@ TAO_Set_Update_Interceptor::send_request ( #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; cdr.reset(); } @@ -134,7 +130,6 @@ TAO_Set_Update_Interceptor::send_request ( #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h index c164c238281..c6ea6c68675 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h @@ -47,11 +47,11 @@ public: virtual ~TAO_Set_Update_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index fadeb16f0e0..f8f9a9fd3c9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -47,11 +47,9 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler ACE_ENV_ARG_ resolve_init<PortableServer::Current>(strategy_->orb(), "POACurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ObjectId_var object_id = - current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + current->get_object_id(); Update_Manager* mgr; int id; @@ -87,7 +85,6 @@ void UpdateableHandler::set_update_excep ( ACE_DEBUG((LM_DEBUG, "Received Exception from")); ACE_TRY { excep_holder->raise_exception(); - ACE_TRY_CHECK; } ACE_CATCHANY { ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A corba exception\n"); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp index fe5cd5dbe41..e35181a00b2 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp @@ -18,30 +18,24 @@ PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa, PortableServer::LifespanPolicy_var lifespan = root_poa->create_lifespan_policy(PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(result); // create a USER_ID IdAssignmentPolicy object PortableServer::IdAssignmentPolicy_var assign = root_poa->create_id_assignment_policy(PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(result); // create PolicyList. size_t orig_len = policy_list.length(); policy_list.length(orig_len+2); - ACE_CHECK_RETURN(result); policy_list[orig_len+0]= PortableServer::LifespanPolicy::_duplicate(lifespan.in()); - ACE_CHECK_RETURN(result); policy_list[orig_len+1]= PortableServer::IdAssignmentPolicy::_duplicate(assign.in()); - ACE_CHECK_RETURN(result); // create the child POA result = root_poa->create_POA(name, mgr.in(), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(result); return result; } |