diff options
| author | huangming <huangminghuang@users.noreply.github.com> | 2003-10-17 06:38:42 +0000 |
|---|---|---|
| committer | huangming <huangminghuang@users.noreply.github.com> | 2003-10-17 06:38:42 +0000 |
| commit | 73f581eda958b0f1a0cef4575447144d9dcab681 (patch) | |
| tree | bfc2c8b8602ae097d917159c935bc4e5e30d0a69 | |
| parent | 066990eecdf5ee2edc5d6de0302800e4fbf51c59 (diff) | |
| download | ATCD-73f581eda958b0f1a0cef4575447144d9dcab681.tar.gz | |
ChangeLogTag: Fri Oct 17 01:28:53 2003 Huang-Ming Huang <hh1@cse.wustl.edu>
52 files changed, 482 insertions, 399 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 487752858fa..8eb450f4388 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,58 @@ +Fri Oct 17 01:28:53 2003 Huang-Ming Huang <hh1@cse.wustl.edu> + + * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp + * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h + * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp + * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h + * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp + * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h + * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp + * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl + * orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h + * orbsvcs/tests/FtRtEvent/PushConsumer.cpp + * orbsvcs/tests/FtRtEvent/PushConsumer.h + * orbsvcs/tests/FtRtEvent/PushSupplier.cpp + * orbsvcs/tests/FtRtEvent/PushSupplier.h + * orbsvcs/tests/FtRtEvent/consumer.cpp + * orbsvcs/tests/FtRtEvent/supplier.cpp + Fixed problems in emulated exception case + Fri Oct 16 06:01:13 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/RTCosScheduling.bor: diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index d0c04d42f2e..a1e796ee001 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -98,21 +98,22 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[]) FtRtecEventChannelAdmin::EventChannel_var ec_ior = ec.activate(membership_ - ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (report_factory(orb_.in(), ec_ior.in())==-1) + if (report_factory(orb_.in(), ec_ior.in() )==-1) return -1; orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred."); + return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN(-1); ACE_Thread_Manager::instance()->wait(); return 0; @@ -201,7 +202,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv []) void FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { RtecScheduler::Scheduler_var scheduler; if (CORBA::is_nil(naming_context)) { @@ -210,7 +211,7 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context CORBA::NO_MEMORY()); scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_CHECK; if (ACE_Scheduler_Factory::server(scheduler.in()) == -1) ACE_ERROR((LM_ERROR,"Unable to install scheduler\n")); @@ -259,6 +260,7 @@ int FT_EventService::report_factory(CORBA::ORB_ptr orb, FtRtecEventChannelAdmin::EventChannel_ptr ec) { + ACE_TRY_NEW_ENV { char* addr = ACE_OS::getenv("EventChannelFactoryAddr"); if (addr != NULL) { @@ -283,7 +285,12 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb, stream.close(); } - return 0; + } + ACE_CATCHALL { + return -1; + } + ACE_ENDTRY; + return 0; } void FT_EventService::become_primary() diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h index d65b67dc17c..41075f5992f 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h @@ -34,7 +34,7 @@ public: private: int parse_args (int argc, ACE_TCHAR* argv []); void setup_scheduler(CosNaming::NamingContext_ptr naming_context - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); int report_factory(CORBA::ORB_ptr orb, FtRtecEventChannelAdmin::EventChannel_ptr ec); virtual void become_primary(); diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index 2ec8cf8f842..16c575ff06b 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -25,7 +25,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( const char * type_id, const FT::Criteria & the_criteria, FT::GenericFactory::FactoryCreationId_out factory_creation_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -69,7 +69,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( void EventChannelFactory_i::delete_object ( const FT::GenericFactory::FactoryCreationId & factory_creation_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -165,37 +165,38 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( ACE_SOCK_Stream stream; ACE_DEBUG((LM_DEBUG, "accepting connection from event channel\n")); - if (acceptor.accept(stream, &client_addr, &timeout) != -1) - { - ACE_DEBUG((LM_DEBUG, "Factory Connect established with %s:%d\n", - client_addr.get_host_name(), client_addr.get_port_number() )); + if (acceptor.accept(stream, &client_addr, &timeout) == -1) + ACE_ERROR_RETURN((LM_ERROR, "accept fail\n"), 0); - // receive the ior string from the created object - char ior[5000] = {'0'}; - int n = 0; - int byteRead=0; - while ((n = stream.recv(ior+byteRead, 5000-byteRead))) { - byteRead += n; - } + ACE_DEBUG((LM_DEBUG, "Factory Connect established with %s:%d\n", + client_addr.get_host_name(), client_addr.get_port_number() )); + + // receive the ior string from the created object - if (strlen(ior) ==0) - return result; + char ior[5000] = {'0'}; + int n = 0; + int byteRead=0; + while ((n = stream.recv(ior+byteRead, 5000-byteRead))) { + byteRead += n; + } + if (strlen(ior) ==0) + return result; - CORBA::Object_var result = orb->string_to_object(ior + ACE_TRY_NEW_ENV { + CORBA::Object_var result = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - - ACE_CHECK_RETURN(result); + ACE_TRY_CHECK; if (objects.bind(id, result) ==0){ return result._retn(); } } - else { - ACE_DEBUG((LM_DEBUG,"accept fail\n")); + ACE_CATCHALL { } + ACE_ENDTRY; - return result; + return 0; } diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h index 9ceba6abc3b..28a1c8f668e 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h @@ -29,7 +29,7 @@ public: const char * type_id, const FT::Criteria & the_criteria, FT::GenericFactory::FactoryCreationId_out factory_creation_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -42,7 +42,7 @@ public: virtual void delete_object ( const FT::GenericFactory::FactoryCreationId & factory_creation_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index 0a68d5fcdf5..06ecb22ba0d 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -57,10 +57,9 @@ int main(int argc, ACE_TCHAR* argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; if (parse_args(argc, argv) == -1) return -1; diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp index 9178b08b0be..47f053e6e61 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp @@ -80,7 +80,8 @@ int main(int argc, ACE_TCHAR** argv) { ACE_TRY_NEW_ENV { - orb = CORBA::ORB_init (argc, argv ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, "" + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args(argc, argv)==-1) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index f6820db4526..b1f9e67b1a0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -138,7 +138,7 @@ FTRT_ClientORB_Interceptor::receive_other ( void FTRT_ClientORB_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { 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 326333d5097..2dddd3bd7f6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -51,7 +51,7 @@ int AMI_Primary_Replication_Strategy::svc() ACE_TRY_NEW_ENV { int argc = 0; char** argv = 0; - orb_ = CORBA::ORB_init (argc, argv ACE_ENV_ARG_PARAMETER); + orb_ = CORBA::ORB_init (argc, argv); ACE_TRY_CHECK; PortableServer::POA_var @@ -131,21 +131,21 @@ AMI_Primary_Replication_Strategy::replicate_request( ACE_CHECK; for (size_t i = 0; i < num_backups; ++i) { - ACE_TRY_NEW_ENV { + ACE_TRY_EX(block1) { PortableServer::ObjectId oid; FTRT::AMI_UpdateableHandler_ptr handler = handler_.activate(manager, i, oid ACE_ENV_ARG_PARAMETER); ScopeGuard guard = MakeObjGuard(*poa_.in(), &PortableServer::POA::deactivate_object, - oid) - ACE_TRY_CHECK; + oid); + ACE_TRY_CHECK_EX(block1); FtRtecEventChannelAdmin::EventChannel_ptr obj = backups[i]; // send set_update request to all the backup replicas obj->sendc_set_update(handler, state ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block1); guard.Dismiss(); } ACE_CATCHANY { @@ -159,9 +159,9 @@ AMI_Primary_Replication_Strategy::replicate_request( if (!success) { // replication failed, transaction depth too high for (size_t i =0; i < num_backups; ++i) { - ACE_TRY_NEW_ENV { + ACE_TRY_EX(block2) { (backups[i]->*rollback)(oid ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block2); } ACE_CATCHALL { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp index b024636d962..be41268c19e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp @@ -16,7 +16,7 @@ AMI_Replication_Strategy::replicate_request( const FTRT::State& state, RollbackOperation rollback, const FtRtecEventChannelAdmin::ObjectId& oid - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_UNUSED_ARG(state); ACE_UNUSED_ARG(rollback); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index c601355e0ed..fa2c3cf0dbd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -39,6 +39,7 @@ TAO_FTEC_ConsumerAdmin::disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr { ACE_TRY_NEW_ENV { obj->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHALL { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index f10dcae7493..be2dd12f747 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -67,7 +67,7 @@ void setup_object_group(TAO_FTEC_Event_Channel* es, FtRtecEventChannelAdmin::EventChannel_ptr TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { FTRTEC::Fault_Detector_Loader* detector_loader = ACE_Dynamic_Service<FTRTEC::Fault_Detector_Loader>::instance("FTRTEC_Fault_Detector"); @@ -126,7 +126,7 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership ec->activate(orb_, supplier_admin_object_id, consumer_admin_object_id - ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN(0); FtRtecEventChannelAdmin::EventChannel_var result; @@ -151,7 +151,7 @@ void TAO_FTEC_Event_Channel::set_listener(TAO_FTEC_Become_Primary_Listener* list void TAO_FTEC_Event_Channel::set_update ( const FTRT::State & s - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -164,7 +164,7 @@ void TAO_FTEC_Event_Channel::set_update ( void TAO_FTEC_Event_Channel::oneway_set_update ( const FTRT::State & s - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -190,7 +190,7 @@ TAO_FTEC_Event_Channel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) void -TAO_FTEC_Event_Channel::set_state (const FTRT::State & s ACE_ENV_ARG_DECL_WITH_DEFAULTS) +TAO_FTEC_Event_Channel::set_state (const FTRT::State & s ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState)) { ACE_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n")); @@ -219,8 +219,7 @@ TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr obs { /// we have yet to implement the replication of observers /// throw an exception for the moment - ACE_THROW(RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER()); - ACE_CHECK; + ACE_THROW_RETURN(RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(), 0); return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER); } @@ -236,7 +235,6 @@ TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle /// we have yet to implement the replication of observers /// throw an exception for the moment ACE_THROW(RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER()); - ACE_CHECK; ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER); } @@ -247,7 +245,7 @@ CORBA::Boolean TAO_FTEC_Event_Channel::start ( FTRT::FaultListener_ptr listener, FTRT::Location_out location - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -260,7 +258,7 @@ void TAO_FTEC_Event_Channel::create_group ( const FTRT::ManagerInfoList & info_list, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -273,7 +271,7 @@ TAO_FTEC_Event_Channel::create_group ( void TAO_FTEC_Event_Channel::join_group ( const FTRT::ManagerInfo & info - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -286,7 +284,7 @@ void TAO_FTEC_Event_Channel::add_member ( const FTRT::ManagerInfo & info, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -299,8 +297,7 @@ void TAO_FTEC_Event_Channel::remove_member ( const FTRT::Location & crashed_location, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -313,7 +310,7 @@ TAO_FTEC_Event_Channel::remove_member ( void TAO_FTEC_Event_Channel::replica_crashed ( const FTRT::Location & location - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -329,7 +326,7 @@ TAO_FTEC_Event_Channel::replica_crashed ( TAO_FTEC_Event_Channel::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -345,7 +342,7 @@ TAO_FTEC_Event_Channel::connect_push_consumer ( TAO_FTEC_Event_Channel::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -359,7 +356,7 @@ TAO_FTEC_Event_Channel::connect_push_supplier ( void TAO_FTEC_Event_Channel::disconnect_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -372,7 +369,7 @@ TAO_FTEC_Event_Channel::disconnect_push_supplier ( void TAO_FTEC_Event_Channel::disconnect_push_consumer ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -385,7 +382,7 @@ TAO_FTEC_Event_Channel::disconnect_push_consumer ( void TAO_FTEC_Event_Channel::suspend_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -399,7 +396,7 @@ TAO_FTEC_Event_Channel::suspend_push_supplier ( void TAO_FTEC_Event_Channel::resume_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -414,7 +411,7 @@ void TAO_FTEC_Event_Channel::push ( const FtRtecEventChannelAdmin::ObjectId & oid, const RtecEventComm::EventSet & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index 07160e02261..3fc9d46a9c1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -50,7 +50,7 @@ public: * */ FtRtecEventChannelAdmin::EventChannel_ptr - activate(MEMBERSHIP membership ACE_ENV_ARG_DECL_WITH_DEFAULTS); + activate(MEMBERSHIP membership ACE_ENV_ARG_DECL); /** * Registers a listener to accept the notication when this object @@ -86,88 +86,88 @@ public: virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::TypeError)) ; virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) ; virtual void disconnect_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disconnect_push_consumer ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) ; virtual void suspend_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)); virtual void resume_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)) ; virtual void push ( const FtRtecEventChannelAdmin::ObjectId & oid, const RtecEventComm::EventSet & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)); /// FTRT::GroupManager Interfaces /// These are used for inter-replica communications void set_state ( - const FTRT::State & s ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const FTRT::State & s ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState)); - virtual void set_update (const FTRT::State & s ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void set_update (const FTRT::State & s ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate, FTRT::OutOfSequence)); - virtual void oneway_set_update (const FTRT::State & s ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void oneway_set_update (const FTRT::State & s ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean start ( FTRT::FaultListener_ptr listener, FTRT::Location_out cur - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void create_group ( const FTRT::ManagerInfoList & info_list, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FTRT::PredecessorUnreachable)) ; virtual void join_group ( const FTRT::ManagerInfo & info - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL )ACE_THROW_SPEC ((CORBA::SystemException)) ; virtual void add_member ( const FTRT::ManagerInfo & info, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) ; virtual void remove_member ( const FTRT::Location & crashed_location, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void replica_crashed ( const FTRT::Location & location - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) ; 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 5fbadc3181e..b053159892f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -18,17 +18,17 @@ ACE_RCSID (EventChannel, void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - ec->consumer_admin()->obtain_proxy(op ACE_ENV_SINGLE_ARG_PARAMETER); + ec->consumer_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void obtain_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - ec->supplier_admin()->obtain_proxy(op ACE_ENV_SINGLE_ARG_PARAMETER); + ec->supplier_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -36,14 +36,14 @@ void obtain_push_consumer_and_connect(TAO_FTEC_Event_Channel_Impl* ec, const FtRtecEventChannelAdmin::ObjectId& oid, RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - Request_Context_Repository().set_object_id(oid); + Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER); RtecEventChannelAdmin::ProxyPushConsumer_var consumer = ec->supplier_admin()->obtain(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + ACE_CHECK; ScopeGuard guard = MakeObjGuard(*ec->supplier_admin(), &TAO_FTEC_SupplierAdmin::disconnect, @@ -51,16 +51,16 @@ void obtain_push_consumer_and_connect(TAO_FTEC_Event_Channel_Impl* ec, consumer->connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + ACE_CHECK; guard.Dismiss(); } void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - PortableServer::POA_var poa= ec->supplier_poa(ACE_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa= ec->supplier_poa(); ACE_CHECK; FtRtecEventChannelAdmin::Connect_push_supplier_param& param = op.param.connect_supplier_param(); @@ -87,14 +87,14 @@ void obtain_push_supplier_and_connect(TAO_FTEC_Event_Channel_Impl* ec, const FtRtecEventChannelAdmin::ObjectId& oid, RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - Request_Context_Repository().set_object_id(oid); + Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER); RtecEventChannelAdmin::ProxyPushSupplier_var supplier = ec->consumer_admin()->obtain(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + ACE_CHECK; ScopeGuard guard = MakeObjGuard(*ec->consumer_admin(), &TAO_FTEC_ConsumerAdmin::disconnect, @@ -102,16 +102,16 @@ void obtain_push_supplier_and_connect(TAO_FTEC_Event_Channel_Impl* ec, supplier->connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + ACE_CHECK; guard.Dismiss(); } void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - PortableServer::POA_var poa= ec->consumer_poa(ACE_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa= ec->consumer_poa(); ACE_CHECK; FtRtecEventChannelAdmin::Connect_push_consumer_param& param = op.param.connect_consumer_param(); @@ -135,9 +135,9 @@ void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - PortableServer::POA_var poa= ec->consumer_poa(ACE_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa= ec->consumer_poa(); ACE_CHECK; TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id); @@ -153,9 +153,9 @@ void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec, void disconnect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - PortableServer::POA_var poa= ec->supplier_poa(ACE_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa= ec->supplier_poa(); ACE_CHECK; TAO_FTEC_ProxyPushConsumer* proxy = ec->find_proxy_push_consumer(op.object_id); @@ -171,9 +171,9 @@ void disconnect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec, void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - PortableServer::POA_var poa= ec->consumer_poa(ACE_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa= ec->consumer_poa(); ACE_CHECK; TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id); @@ -189,11 +189,8 @@ void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec, void resume_connection(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { - PortableServer::POA_var poa= ec->consumer_poa(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id); @@ -208,7 +205,7 @@ void resume_connection(TAO_FTEC_Event_Channel_Impl* ec, typedef void (*Set_update_fun)(TAO_FTEC_Event_Channel_Impl* ec, FtRtecEventChannelAdmin::Operation& op - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); Set_update_fun update_table[] = { &obtain_push_supplier, @@ -251,7 +248,7 @@ TAO_FTEC_Event_Channel_Impl::activate ( CORBA::ORB_var orb, const PortableServer::ObjectId& supplier_admin_oid, const PortableServer::ObjectId& consumer_admin_oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { iogr_maker_.init(orb.in() ACE_ENV_ARG_PARAMETER); @@ -300,7 +297,7 @@ ACE_THROW_SPEC ((CORBA::SystemException)) TAO_FTEC_Event_Channel_Impl::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) { CORBA::Any_var any @@ -321,7 +318,7 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer ( FtRtecEventChannelAdmin::ObjectId_var object_id = oid; - Request_Context_Repository().generate_object_id(*oid); + Request_Context_Repository().generate_object_id(*oid ACE_ENV_ARG_PARAMETER); obtain_push_supplier_and_connect(this, object_id.in(), @@ -339,7 +336,7 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer ( TAO_FTEC_Event_Channel_Impl::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) { CORBA::Any_var any @@ -359,7 +356,7 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier ( ACE_NEW_THROW_EX(oid, FtRtecEventChannelAdmin::ObjectId, CORBA::NO_MEMORY()); FtRtecEventChannelAdmin::ObjectId_var object_id = oid; - Request_Context_Repository().generate_object_id(*oid); + Request_Context_Repository().generate_object_id(*oid ACE_ENV_ARG_PARAMETER); obtain_push_consumer_and_connect(this, object_id.in(), @@ -375,7 +372,7 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier ( void TAO_FTEC_Event_Channel_Impl::disconnect_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) { if (Request_Context_Repository().is_executed_request()) @@ -393,7 +390,7 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_supplier ( void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) { if (Request_Context_Repository().is_executed_request()) @@ -411,7 +408,7 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer ( void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) { if (Request_Context_Repository().is_executed_request()) @@ -430,7 +427,7 @@ void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier ( void TAO_FTEC_Event_Channel_Impl::resume_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) { if (Request_Context_Repository().is_executed_request()) @@ -449,7 +446,7 @@ void TAO_FTEC_Event_Channel_Impl::resume_push_supplier ( void TAO_FTEC_Event_Channel_Impl::push ( const FtRtecEventChannelAdmin::ObjectId & oid, const RtecEventComm::EventSet & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) { TAO_FTEC_ProxyPushConsumer* proxy = this->find_proxy_push_consumer(oid); @@ -494,7 +491,7 @@ void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate)) { FTRTEC::Replication_Service::instance()->check_validity(ACE_ENV_SINGLE_ARG_PARAMETER); @@ -535,7 +532,7 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_supplier(const PortableServer::Obje PortableServer::Servant servant = poa->id_to_servant(id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + ACE_TRY_CHECK; POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr obj = ACE_reinterpret_cast ( POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr, @@ -558,7 +555,7 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const PortableServer::Obje PortableServer::Servant servant = poa->id_to_servant(id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); + ACE_TRY_CHECK; POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr obj = ACE_reinterpret_cast ( POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr, 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 7f23a208cad..b2fded20e85 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -43,7 +43,7 @@ public: CORBA::ORB_var orb, const PortableServer::ObjectId& supplier_admin_oid, const PortableServer::ObjectId& consumer_admin_oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); // = The RtecEventChannelAdmin::EventChannel methods... @@ -57,11 +57,11 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); void get_state (FtRtecEventChannelAdmin::EventChannelState & s - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); - void set_state (const FTRT::State & stat ACE_ENV_ARG_DECL_WITH_DEFAULTS); + void set_state (const FTRT::State & stat ACE_ENV_ARG_DECL); - void set_update (const FTRT::State & s ACE_ENV_ARG_DECL_WITH_DEFAULTS) + void set_update (const FTRT::State & s ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate)); /// EventChannelFacade Interface @@ -69,40 +69,40 @@ public: virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ); virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS & qos - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ); virtual void disconnect_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ); virtual void disconnect_push_consumer ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ); virtual void suspend_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ); virtual void resume_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ); virtual void push ( const FtRtecEventChannelAdmin::ObjectId & oid, const RtecEventComm::EventSet & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ); //////////////////////////////////////////// @@ -120,7 +120,7 @@ public: CORBA::Object_var make_iogr(CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); protected: TAO_FTEC_Basic_Factory* factory(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index f58713be75e..ae92bfbb833 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -81,7 +81,7 @@ TAO_FTEC_Group_Manager::~TAO_FTEC_Group_Manager() CORBA::Boolean TAO_FTEC_Group_Manager::start ( FTRT::FaultListener_ptr listener, FTRT::Location_out cur - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -96,7 +96,7 @@ CORBA::Boolean TAO_FTEC_Group_Manager::start ( void TAO_FTEC_Group_Manager::create_group ( const FTRT::ManagerInfoList & info_list, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { ACE_DEBUG((LM_DEBUG, "create_group\n")); IOGR_Maker::instance()->set_ref_version( object_group_ref_version ); @@ -131,20 +131,21 @@ void TAO_FTEC_Group_Manager::create_group ( void TAO_FTEC_Group_Manager::join_group ( const FTRT::ManagerInfo & info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { ACE_DEBUG((LM_DEBUG, "join group\n")); if (impl_->my_position == 0) { FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); - add_member(info, IOGR_Maker::instance()->increment_ref_version() ); + add_member(info, IOGR_Maker::instance()->increment_ref_version() + ACE_ENV_ARG_PARAMETER); } } void TAO_FTEC_Group_Manager::add_member ( const FTRT::ManagerInfo & info, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { ACE_DEBUG((LM_DEBUG, "add_member location = <%s>\n", (const char*)info.the_location[0].id)); @@ -159,18 +160,18 @@ void TAO_FTEC_Group_Manager::add_member ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; - if (impl_->my_position < impl_->info_list.length()-2) + if (impl_->my_position < impl_->info_list.length()-2) { // I am not the last of replica, tell my successor that // a new member has joined in. - ACE_TRY { + ACE_TRY_EX(block) { publisher->successor()->add_member(info, object_group_ref_version ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_TRY_CHECK_EX(block); return; - } + } ACE_CATCHANY { - // Unable to send request to all the successors. + // Unable to send request to all the successors. // Now this node become the last replica of the object group. } ACE_ENDTRY; @@ -221,18 +222,19 @@ void remove_item(SEQ & seq, int position) void TAO_FTEC_Group_Manager::replica_crashed ( const FTRT::Location & location - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { ACE_DEBUG((LM_DEBUG, "TAO_FTEC_Group_Manager::replica_crashed\n")); FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); - remove_member(location, IOGR_Maker::instance()->increment_ref_version()); + remove_member(location, IOGR_Maker::instance()->increment_ref_version() + ACE_ENV_ARG_PARAMETER); } void TAO_FTEC_Group_Manager::remove_member ( const FTRT::Location & crashed_location, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { // find my position of this EventChannel in the group unsigned crashed_pos = find_by_location(impl_->info_list, crashed_location); @@ -278,8 +280,10 @@ void TAO_FTEC_Group_Manager::connection_closed() // crashed_location will be repliaced by its successor. FTRT::Location crashed_location = impl_->info_list[impl_->my_position-1].the_location; + ACE_DECLARE_NEW_CORBA_ENV; + if (impl_->my_position > 1) { - ACE_TRY_NEW_ENV { + ACE_TRY_EX(block1) { TAO_IOP::TAO_IOR_Manipulation::IORList iors; iors.length(impl_->my_position-1); for (size_t i = 0; i < impl_->my_position-1; ++i) @@ -288,16 +292,16 @@ void TAO_FTEC_Group_Manager::connection_closed() CORBA::Object_var obj = IOGR_Maker::instance()->merge_iors(iors ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block1); FtRtecEventChannelAdmin::EventChannel_var primary = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block1); primary->replica_crashed(crashed_location ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block1); return; } ACE_CATCHANY { @@ -305,11 +309,11 @@ void TAO_FTEC_Group_Manager::connection_closed() ACE_ENDTRY; } - ACE_TRY_NEW_ENV { + ACE_TRY_EX(block2) { remove_member(crashed_location, IOGR_Maker::instance()->increment_ref_version() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block2); } ACE_CATCHANY { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h index dd2aaa0d849..9fd05992ef1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -33,7 +33,7 @@ public: virtual CORBA::Boolean start ( FTRT::FaultListener_ptr listener, FTRT::Location_out cur - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -42,30 +42,30 @@ public: void create_group ( const FTRT::ManagerInfoList & info_list, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); void join_group ( const FTRT::ManagerInfo & info - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); void add_member ( const FTRT::ManagerInfo & info, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); void remove_member ( const FTRT::Location & crashed_location, CORBA::ULong object_group_ref_version - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); void replica_crashed ( const FTRT::Location & location - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); private: virtual void get_state ( FtRtecEventChannelAdmin::EventChannelState & s - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL )=0; virtual void connection_closed(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp index 6e7c4e28678..1e14a103639 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -4,7 +4,6 @@ #include "Request_Context_Repository.h" #include "Replication_Service.h" #include "../Utils/activate_with_id.h" -#include "../Utils/ScopeGuard.h" ACE_RCSID (EventChannel, TAO_FTEC_ProxyPushConsumer, @@ -54,7 +53,7 @@ TAO_FTEC_ProxyPushConsumer::activate ( void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)) { @@ -71,22 +70,24 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( Inherited::connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; - ScopeGuard guard = MakeObjGuard(*this, &Inherited::disconnect_push_consumer); - - FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); - { + ACE_TRY { + FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc); svc->replicate_request(update, - &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } - - guard.Dismiss(); + ACE_CATCHALL { + this->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_RE_THROW; + } + ACE_ENDTRY; + ACE_CHECK; } -void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) @@ -116,7 +117,8 @@ void TAO_FTEC_ProxyPushConsumer::get_state(FtRtecEventChannelAdmin::ProxyPushCon } } -void TAO_FTEC_ProxyPushConsumer::set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state) +void TAO_FTEC_ProxyPushConsumer::set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil(state.parameter.info().push_supplier.in()) ) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index bce4a0c9127..342b3aa29f3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -41,15 +41,16 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); const PortableServer::ObjectId& id() const; void get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state); - void set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state); + void set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state + ACE_ENV_ARG_DECL); typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation) (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL_WITH_DEFAULTS); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index aa1f45aee54..1e6480808cd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -4,7 +4,6 @@ #include "../Utils/activate_with_id.h" #include "Request_Context_Repository.h" #include "Replication_Service.h" -#include "../Utils/ScopeGuard.h" ACE_RCSID (EventChannel, TAO_FTEC_ProxyPushSupplier, @@ -54,7 +53,7 @@ TAO_FTEC_ProxyPushSupplier::activate ( void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)) @@ -72,23 +71,23 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( Inherited::connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; - ScopeGuard guard = MakeObjGuard(*this, &Inherited::disconnect_push_supplier); + ACE_TRY { + FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); - FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); - { ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc); svc->replicate_request(update, &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_TRY_CHECK; } - - guard.Dismiss(); + ACE_CATCHALL { + } + ACE_ENDTRY; } -void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) @@ -109,8 +108,8 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DE } -void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException)) +void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; @@ -120,28 +119,32 @@ ACE_THROW_SPEC ((CORBA::SystemException)) update.param._d(FtRtecEventChannelAdmin::SUSPEND_CONNECTION); Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER); - - ScopeGuard guard = MakeObjGuard(*this, &Inherited::resume_connection); ACE_CHECK; - FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); + + ACE_TRY { + FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc); svc->replicate_request(update, &FtRtecEventChannelAdmin::EventChannel::resume_push_supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_TRY_CHECK; } - guard.Dismiss(); + ACE_CATCHALL { + this->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_RE_THROW; + } + ACE_ENDTRY; } -void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -ACE_THROW_SPEC ((CORBA::SystemException)) +void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; - Request_Context_Repository().set_object_id(id()); + Request_Context_Repository().set_object_id(id() ACE_ENV_ARG_PARAMETER); FtRtecEventChannelAdmin::Operation update; update.object_id = id(); update.param._d(FtRtecEventChannelAdmin::RESUME_CONNECTION); @@ -149,19 +152,21 @@ ACE_THROW_SPEC ((CORBA::SystemException)) Inherited::resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - ScopeGuard guard = MakeObjGuard(*this, &Inherited::suspend_connection); + ACE_TRY { + FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); - FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); - { ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc); svc->replicate_request(update, &FtRtecEventChannelAdmin::EventChannel::suspend_push_supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_TRY_CHECK; } - - guard.Dismiss(); + ACE_CATCHALL { + this->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_RE_THROW; + } + ACE_ENDTRY; } @@ -178,7 +183,8 @@ void TAO_FTEC_ProxyPushSupplier::get_state(FtRtecEventChannelAdmin::ProxyPushSup } -void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state) +void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil(state.parameter.info().push_consumer.in())) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index ceb9c6ffba0..d1ba7a7dbc5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -40,24 +40,25 @@ public: virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); const PortableServer::ObjectId& id() const; void get_state(FtRtecEventChannelAdmin::ProxyPushSupplierStat& state); - void set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state); + void set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state + ACE_ENV_ARG_DECL); typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation) - (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL_WITH_DEFAULTS); + (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL); static const RollbackOperation rollback_obtain; private: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index ef8111f521c..b67a0fe6a3a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -37,6 +37,7 @@ TAO_FTEC_SupplierAdmin::disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr { ACE_TRY_NEW_ENV { obj->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHALL { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index 95b4e0bced8..31623da0184 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -19,7 +19,7 @@ FT_ProxyAdmin_Base::~FT_ProxyAdmin_Base() } void FT_ProxyAdmin_Base::activate(const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { poa_->activate_object_with_id(oid, servant_ ACE_ENV_ARG_PARAMETER); @@ -34,7 +34,7 @@ const PortableServer::ObjectId& FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG } -CORBA::Object_var FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const +CORBA::Object_var FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) 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 bb6199c942e..6d56cf15bba 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -27,12 +27,12 @@ public: PortableServer::POA_var poa); virtual ~FT_ProxyAdmin_Base(); void activate(const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); - const PortableServer::ObjectId& object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const; + const PortableServer::ObjectId& object_id(ACE_ENV_SINGLE_ARG_DECL) const; /// Returns an CORBA object reference when the servant is activated - CORBA::Object_var reference(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const; + CORBA::Object_var reference(ACE_ENV_SINGLE_ARG_DECL) 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 0b760c04b0c..ad3638fa1e9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp @@ -29,8 +29,8 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy ( ScopeGuard guard = MakeObjGuard(*admin_, &EC_PROXY_ADMIN::disconnect, - result.in() - ACE_ENV_ARG_PARAMETER); + result.in()); + ACE_CHECK; FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); @@ -54,7 +54,7 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_E CORBA::Any_var any = Request_Context_Repository().get_cached_result(); CORBA::Object_var obj; if (*any >>= CORBA::Any::to_object(obj)) - return ProxyInterface::_narrow(obj.in()); + return ProxyInterface::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); FtRtecEventChannelAdmin::ObjectId oid; Request_Context_Repository().generate_object_id(oid @@ -73,15 +73,14 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_E ScopeGuard guard = MakeObjGuard(*admin_, &EC_PROXY_ADMIN::disconnect, - result.in() - ACE_ENV_ARG_PARAMETER); + result.in()); ACE_CHECK_RETURN(0); 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_ENV_ARG_PARAMETER); ACE_CHECK_RETURN(0); result = ProxyInterface::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); @@ -134,8 +133,7 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state( ACE_CHECK; Skeleton skeleton = ACE_reinterpret_cast(Skeleton, - servant->_downcast(proxy_ior->_interface_repository_id() - ACE_ENV_ARG_PARAMETER)); + servant->_downcast(proxy_ior->_interface_repository_id())); ACE_CHECK; ACE_static_cast(Proxy* , skeleton)->set_state(proxy_state diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 60bdd65dc32..c846cd4558b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -12,7 +12,7 @@ ACE_RCSID (EventChannel, "$Id$") CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { CORBA::String_var orb_id = ri->orb_id(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(CORBA::Object::_nil()); @@ -51,7 +51,7 @@ CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri } CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { CORBA::Object_var target = get_target(ri ACE_ENV_ARG_PARAMETER); @@ -81,19 +81,19 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor() { } -char * ForwardCtrlServerInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) +char * ForwardCtrlServerInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup("ForwardCtrlServerInterceptor"); } -void ForwardCtrlServerInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) +void ForwardCtrlServerInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -122,14 +122,14 @@ void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerR void ForwardCtrlServerInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { } FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_context - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { TAO_InputCDR cdr (ACE_reinterpret_cast (const char*, service_context->context_data.get_buffer () @@ -139,16 +139,15 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c CORBA::Boolean byte_order; if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, - CORBA::COMPLETED_NO)); + ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO), 0); cdr.reset_byte_order (ACE_static_cast (int,byte_order)); FT::FTGroupVersionServiceContext fgvsc; if ((cdr >> fgvsc) == 0) - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, - CORBA::COMPLETED_NO)); + ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, + CORBA::COMPLETED_NO), 0); return fgvsc.object_group_ref_version; } @@ -156,48 +155,47 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceContext_var service_context; FT::ObjectGroupRefVersion version; - ACE_TRY { - + ACE_TRY_EX(block1) + { if (!ri->response_expected(ACE_ENV_SINGLE_ARG_PARAMETER)) return; - ACE_TRY_CHECK; - - + ACE_TRY_CHECK_EX(block1); service_context = ri->get_request_service_context(IOP::FT_GROUP_VERSION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block1); // get the ref version service context version = get_ft_group_version(service_context ACE_ENV_ARG_PARAMETER); - - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block1); } ACE_CATCHALL { // not an FT call , continue to reply the request return; } ACE_ENDTRY; + // pass a new IOGR if the client use an outdated version IOGR_Maker* maker = IOGR_Maker::instance(); - ACE_DEBUG((LM_DEBUG, "Current GROUP Version = %d, received version = %d\n", + ACE_DEBUG((LM_DEBUG, "Current GROUP Version = %d, received version = %d\n", maker->get_ref_version(), version)); if (version < maker->get_ref_version()) { ACE_DEBUG((LM_DEBUG, "Outdated IOGR version, passing new IOGR\n")); - ACE_TRY { + + ACE_TRY_EX(block2) { CORBA::Object_var forward = get_forward(ri ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block2); IOP::ServiceContext sc; sc.context_id = FTRT::FT_FORWARD; @@ -214,7 +212,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques sc.context_data.replace(mb.length(), &mb); ri->add_reply_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK_EX(block2); ACE_DEBUG((LM_DEBUG, "reply_service_context added\n")); } @@ -226,14 +224,14 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques } void ForwardCtrlServerInterceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { } void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h index d5f4e285fd1..659dfff81f3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h @@ -24,34 +24,34 @@ public: ForwardCtrlServerInterceptor(); ~ForwardCtrlServerInterceptor(); - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 80a6cb70623..deecbb2d9a8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -77,7 +77,7 @@ retrieve_ft_request_context( PortableInterceptor::ServerRequestInfo_ptr ri, IOP::ServiceContext_var& service_context, FT::FTRequestServiceContext& ft_request_service_context - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) { service_context = ri->get_request_service_context(IOP::FT_REQUEST ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -105,13 +105,13 @@ retrieve_ft_request_context( FTRT::TransactionDepth get_transaction_depth_context( PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) { IOP::ServiceContext_var service_context; ACE_TRY { service_context = ri->get_request_service_context(FTRT::FT_TRANSACTION_DEPTH ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(-1); + ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_PARAM, ex) { @@ -143,13 +143,13 @@ get_transaction_depth_context( FTRT::SequenceNumber get_sequence_number_context( PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) { FTRT::SequenceNumber result; IOP::ServiceContext_var service_context; service_context = ri->get_request_service_context(FTRT::FT_SEQUENCE_NUMBER ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); const char * buf = ACE_reinterpret_cast (const char *, @@ -160,12 +160,12 @@ get_sequence_number_context( CORBA::Boolean byte_order; if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) - ACE_THROW (CORBA::BAD_PARAM ()); + ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); cdr.reset_byte_order (ACE_static_cast (int,byte_order)); if ((cdr >> result) == 0) - ACE_THROW (CORBA::BAD_PARAM ()); + ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); return result; } @@ -270,7 +270,7 @@ FtEventServiceInterceptor::receive_request_service_contexts ( void FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -281,7 +281,7 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn void FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { FT::FTRequestServiceContext ft_request_service_context; @@ -292,7 +292,7 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt service_context, ft_request_service_context ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_PARAM, ex) { return; @@ -307,7 +307,7 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt void FtEventServiceInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -320,8 +320,7 @@ FtEventServiceInterceptor::send_exception ( } void -FtEventServiceInterceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr +FtEventServiceInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index b80eaac1904..2261bf78954 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -49,34 +49,34 @@ public: ~FtEventServiceInterceptor(); static FtEventServiceInterceptor* instance(); - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index ae6604475f3..f5340424076 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -59,7 +59,7 @@ GroupInfoPublisherBase::backups() const void GroupInfoPublisherBase::update(const FTRT::ManagerInfoList & info_list, int my_position - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { bool become_primary = (my_position == 0 && !primary_); primary_ = (my_position == 0); @@ -81,7 +81,7 @@ GroupInfoPublisherBase::update(const FTRT::ManagerInfoList & info_list, iogr_ = ::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in() - ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (primary_ && !CORBA::is_nil(naming_context_.in())) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index f651149691a..3ee00248d93 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -42,7 +42,7 @@ public: void update(const FTRT::ManagerInfoList & info_list, int my_position - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); const PortableServer::ObjectId& object_id() const; const CosNaming::Name& name() const; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index 1fa0c207acc..9c127c605fa 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -25,7 +25,7 @@ IOGR_Maker::IOGR_Maker() void IOGR_Maker::init(CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { iorm_ = resolve_init<TAO_IOP::TAO_IOR_Manipulation>(orb, TAO_OBJID_IORMANIPULATION @@ -45,7 +45,7 @@ IOGR_Maker::instance() CORBA::Object_ptr IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { CORBA::Object_var obj; if (list.length() != 1) @@ -58,7 +58,7 @@ IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list CORBA::Object_ptr IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { CORBA::Object_var obj = merge_iors(list ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN(CORBA::Object::_nil()); @@ -91,14 +91,14 @@ void replace_key(char* ior, char* end_ior, CORBA::Object_ptr IOGR_Maker::forge_iogr(CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { CORBA::Object_var merged; // make a copy of the object FtRtecEventChannelAdmin::EventChannel_var successor = GroupInfoPublisher::instance()->successor(); if (! CORBA::is_nil(successor.in())) { - TAO::ObjectKey_var newkey = obj->_key(); + TAO::ObjectKey_var newkey = obj->_key(ACE_ENV_SINGLE_ARG_PARAMETER); CORBA::Object_var new_base = ior_replace_key(successor.in(), newkey.in() ACE_ENV_ARG_PARAMETER); @@ -150,7 +150,7 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj CORBA::Object_ptr IOGR_Maker::ior_replace_key(CORBA::Object_ptr obj, const TAO::ObjectKey& key - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { TAO_OutputCDR out_cdr; if (!(out_cdr << obj)) @@ -248,7 +248,7 @@ IOGR_Maker::get_ref_version() const void IOGR_Maker::set_tag_components(CORBA::Object_ptr merged, CORBA::Object_ptr primary - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { // set the primary TAO_FT_IOGR_Property prop (ft_tag_component_); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h index fde6448cecc..99619a369d3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h @@ -26,7 +26,7 @@ public: IOGR_Maker(); void init(CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); /// instance() will only return a valid object after an /// instance is explicitly created by client and init() is called. @@ -35,20 +35,20 @@ public: /// Create a new object reference by merging the profiles lists in the /// supplied list of one or more object references. CORBA::Object_ptr merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); /// Create a new IOGR (with FT_PRIMARY and FT_GROUP components) by merging /// the profiles lists in the supplied list of one or more object references. CORBA::Object_ptr make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); /// Make an new IOGR with obj as primary. CORBA::Object_ptr forge_iogr(CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); CORBA::Object_ptr ior_replace_key(CORBA::Object_ptr obj, const TAO::ObjectKey& key - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); bool copy_ft_group_component(CORBA::Object_ptr obj); @@ -60,7 +60,7 @@ public: private: void set_tag_components(CORBA::Object_ptr merged, CORBA::Object_ptr primary - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); TAO_IOP::TAO_IOR_Manipulation_var iorm_; FT::TagFTGroupTaggedComponent ft_tag_component_; }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp index 0b3db457a8d..7869ab38378 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp @@ -25,7 +25,7 @@ void ProxyConsumerStateWorker::set_size(size_t size) } void ProxyConsumerStateWorker::work(TAO_EC_ProxyPushConsumer* object - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) { TAO_FTEC_ProxyPushConsumer* proxy = static_cast<TAO_FTEC_ProxyPushConsumer*>(object); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp index af864699aac..cb455699293 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp @@ -27,7 +27,7 @@ void ProxySupplierStateWorker::set_size(size_t size) } void ProxySupplierStateWorker::work(TAO_EC_ProxyPushSupplier* object - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) { TAO_FTEC_ProxyPushSupplier* proxy = static_cast<TAO_FTEC_ProxyPushSupplier*>(object); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index 3a63e2a495b..3b585271a4b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -84,8 +84,8 @@ namespace FTRTEC { Replication_Strategy* strategy = replication_strategy->make_primary_strategy(); - if (strategy == 0) - ACE_THROW(CORBA::NO_MEMORY()); + + ACE_ASSERT(strategy); if (replication_strategy.get() != strategy) { replication_strategy.reset(strategy); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index 7c87e793d5e..241c11a0494 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -35,7 +35,9 @@ Request_Context_Repository::init(CORBA::ORB_ptr the_orb) orb = the_orb; } -void Request_Context_Repository::generate_object_id(FtRtecEventChannelAdmin::ObjectId& oid) +void Request_Context_Repository::generate_object_id( + FtRtecEventChannelAdmin::ObjectId& oid + ACE_ENV_ARG_DECL) { oid.length(sizeof(UUID)); UUID::create(oid.get_buffer()); @@ -45,8 +47,9 @@ void Request_Context_Repository::generate_object_id(FtRtecEventChannelAdmin::Obj } void -Request_Context_Repository::set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id - ACE_ENV_ARG_DECL) +Request_Context_Repository::set_object_id( + const FtRtecEventChannelAdmin::ObjectId& object_id + ACE_ENV_ARG_DECL) { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" @@ -80,7 +83,7 @@ get_object_id(CORBA::Any_var a FtRtecEventChannelAdmin::ObjectId_var -Request_Context_Repository::get_object_id(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) +Request_Context_Repository::get_object_id(ACE_ENV_SINGLE_ARG_DECL) { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" @@ -96,12 +99,13 @@ Request_Context_Repository::get_object_id(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) } FtRtecEventChannelAdmin::ObjectId_var -Request_Context_Repository::get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) +Request_Context_Repository::get_object_id( + PortableInterceptor::ServerRequestInfo_ptr ri + ACE_ENV_ARG_DECL) { CORBA::Any_var a = ri->get_slot(object_id_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var); + ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var()); return ::get_object_id(a ACE_ENV_ARG_PARAMETER); @@ -109,15 +113,17 @@ Request_Context_Repository::get_object_id(PortableInterceptor::ServerRequestInfo } void -Request_Context_Repository::set_cached_result(PortableInterceptor::ServerRequestInfo_ptr ri, - const CORBA::Any& result - ACE_ENV_ARG_DECL) +Request_Context_Repository::set_cached_result( + PortableInterceptor::ServerRequestInfo_ptr ri, + const CORBA::Any& result + ACE_ENV_ARG_DECL) { - ri->set_slot(cached_result_slot, result ACE_ENV_ARG_PARAMETER); + ri->set_slot(cached_result_slot, + result ACE_ENV_ARG_PARAMETER); } CORBA::Any_ptr -Request_Context_Repository::get_cached_result(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) +Request_Context_Repository::get_cached_result(ACE_ENV_SINGLE_ARG_DECL) { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" @@ -130,18 +136,25 @@ Request_Context_Repository::get_cached_result(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAU return a._retn(); } -bool Request_Context_Repository::is_executed_request(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) +bool Request_Context_Repository::is_executed_request() { - CORBA::Any_var any = get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN(false); - - CORBA::TypeCode_var type = any->type(); - return type->kind() != CORBA::tk_null; + ACE_TRY_NEW_ENV { + CORBA::Any_var any = get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + CORBA::TypeCode_var type = any->type(); + return type->kind() != CORBA::tk_null; + } + ACE_CATCHALL { + } + ACE_ENDTRY; + return false; } -void Request_Context_Repository::set_sequence_number(PortableInterceptor::ServerRequestInfo_ptr ri, - FTRT::SequenceNumber seq_num - ACE_ENV_ARG_DECL) +void +Request_Context_Repository::set_sequence_number( + PortableInterceptor::ServerRequestInfo_ptr ri, + FTRT::SequenceNumber seq_num + ACE_ENV_ARG_DECL) { CORBA::Any a; @@ -151,8 +164,9 @@ void Request_Context_Repository::set_sequence_number(PortableInterceptor::Server } void -Request_Context_Repository::set_sequence_number(FTRT::SequenceNumber seq_num - ACE_ENV_ARG_DECL) +Request_Context_Repository::set_sequence_number( + FTRT::SequenceNumber seq_num + ACE_ENV_ARG_DECL) { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" @@ -173,7 +187,7 @@ Request_Context_Repository::get_sequence_number(ACE_ENV_SINGLE_ARG_DECL) PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + 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; @@ -252,7 +266,7 @@ Request_Context_Repository::get_transaction_depth( { CORBA::Any_var a = ri->get_slot(transaction_depth_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); FTRT::TransactionDepth result=0; a >>= result; return result; @@ -261,16 +275,16 @@ Request_Context_Repository::get_transaction_depth( FTRT::TransactionDepth Request_Context_Repository::get_transaction_depth( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL) { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); CORBA::Any_var a = pic->get_slot(transaction_depth_slot ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + 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 2818a3bf747..158b43ea297 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -49,7 +49,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_WITH_DEFAULTS); + FtRtecEventChannelAdmin::ObjectId_var get_object_id(ACE_ENV_SINGLE_ARG_DECL); FtRtecEventChannelAdmin::ObjectId_var get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL); @@ -58,7 +58,7 @@ public: const CORBA::Any& result ACE_ENV_ARG_DECL); - CORBA::Any_ptr get_cached_result(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + CORBA::Any_ptr get_cached_result(ACE_ENV_SINGLE_ARG_DECL); bool is_executed_request(); void set_sequence_number(PortableInterceptor::ServerRequestInfo_ptr ri, @@ -78,8 +78,8 @@ public: ACE_ENV_ARG_DECL); CORBA::Any_var get_ft_request_service_context( - PortableInterceptor::ClientRequestInfo_ptr - riACE_ENV_ARG_DECL); + PortableInterceptor::ClientRequestInfo_ptr ri + ACE_ENV_ARG_DECL); void set_transaction_depth( PortableInterceptor::ServerRequestInfo_ptr ri, @@ -91,7 +91,7 @@ public: ACE_ENV_ARG_DECL); FTRT::TransactionDepth get_transaction_depth( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL); FTRT::TransactionDepth get_transaction_depth( PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 12d8de6e9e3..f09c2c5d9a9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -65,7 +65,7 @@ TAO_Set_Update_Interceptor::send_request ( ACE_CHECK; FTRT::TransactionDepth transaction_depth = - Request_Context_Repository().get_transaction_depth(ri); + Request_Context_Repository().get_transaction_depth(ri ACE_ENV_ARG_PARAMETER); TAO_OutputCDR cdr; ACE_Message_Block mb; @@ -112,7 +112,7 @@ TAO_Set_Update_Interceptor::send_request ( void TAO_Set_Update_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(ri); @@ -130,7 +130,7 @@ TAO_Set_Update_Interceptor::receive_other ( void TAO_Set_Update_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index f540dee6335..77d43f4d398 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -22,7 +22,7 @@ UpdateableHandler::~UpdateableHandler() FTRT::AMI_UpdateableHandler_ptr UpdateableHandler::activate( Update_Manager* mgr, int id, PortableServer::ObjectId& object_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { object_id.length(sizeof(mgr) + sizeof(id)); memcpy(object_id.get_buffer(), &mgr, sizeof(mgr)); @@ -65,18 +65,18 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler ACE_ENV_ARG_ } void UpdateableHandler::set_update ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_DEBUG((LM_DEBUG,"Received reply from ")); - dispatch(&Update_Manager::handle_reply); + dispatch(&Update_Manager::handle_reply ACE_ENV_ARG_PARAMETER); } void UpdateableHandler::set_update_excep ( FTRT::AMI_UpdateableExceptionHolder * excep_holder - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -85,11 +85,12 @@ void UpdateableHandler::set_update_excep ( ACE_DEBUG((LM_DEBUG, "Received Exception from")); ACE_TRY { excep_holder->raise_set_update(); + ACE_TRY_CHECK; } ACE_CATCHANY { ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A corba exception\n"); } ACE_ENDTRY; - dispatch(&Update_Manager::handle_exception); + dispatch(&Update_Manager::handle_exception ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 639504f0345..a1ba493264f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -30,20 +30,20 @@ public: FTRT::AMI_UpdateableHandler_ptr activate( Update_Manager* mgr, int id, PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); typedef void (Update_Manager::*Handler)(int); void dispatch(Handler handler ACE_ENV_ARG_DECL) ; virtual void set_update ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_update_excep ( FTRT::AMI_UpdateableExceptionHolder * excep_holder - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp index 1a837b0d343..da10c2f1a7f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp @@ -10,36 +10,36 @@ PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa, PortableServer::POAManager_var mgr, const char* name, CORBA::PolicyList& policy_list - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) { PortableServer::POA_var result; PortableServer::LifespanPolicy_var lifespan = root_poa->create_lifespan_policy(PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + 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; + ACE_CHECK_RETURN(result); // create PolicyList. size_t orig_len = policy_list.length(); policy_list.length(orig_len+2); - ACE_CHECK; + ACE_CHECK_RETURN(result); policy_list[orig_len+0]= PortableServer::LifespanPolicy::_duplicate(lifespan.in()); - ACE_CHECK; + ACE_CHECK_RETURN(result); policy_list[orig_len+1]= PortableServer::IdAssignmentPolicy::_duplicate(assign.in()); - ACE_CHECK; + ACE_CHECK_RETURN(result); // create the child POA result = root_poa->create_POA(name, mgr.in(), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(result); return result; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h index 53ca31e052a..9de80b870c4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h @@ -21,5 +21,5 @@ PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa, PortableServer::POAManager_var mgr, const char* name, CORBA::PolicyList& policy_list - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL); #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index e1302565b9e..d1bbf4d04ff 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -91,10 +91,10 @@ class PushConsumerHandler : public POA_FtRtecEventComm::AMI_PushConsumerHandler public: PushConsumerHandler(); ~PushConsumerHandler(); - virtual void push () + virtual void push (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder) + virtual void push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -157,13 +157,13 @@ FTEC_Gateway::activate(PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) policy_list.length(3); policy_list[0] = PortableServer::IdUniquenessPolicy::_duplicate( - id_uniqueness_policy.in() ACE_ENV_ARG_PARAMETER); + id_uniqueness_policy.in()); ACE_CHECK_RETURN(0); policy_list[1]= - PortableServer::LifespanPolicy::_duplicate(lifespan.in() ACE_ENV_ARG_PARAMETER); + PortableServer::LifespanPolicy::_duplicate(lifespan.in()); ACE_CHECK_RETURN(0); policy_list[2]= - PortableServer::IdAssignmentPolicy::_duplicate(assign.in() ACE_ENV_ARG_PARAMETER); + PortableServer::IdAssignmentPolicy::_duplicate(assign.in()); ACE_CHECK_RETURN(0); PortableServer::POAManager_var mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); @@ -202,14 +202,14 @@ FTEC_Gateway::activate(PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) //= The RtecEventChannelAdmin::EventChannel methods RtecEventChannelAdmin::ConsumerAdmin_ptr -FTEC_Gateway::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +FTEC_Gateway::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(impl_->consumer_admin.in()); } RtecEventChannelAdmin::SupplierAdmin_ptr -FTEC_Gateway::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) +FTEC_Gateway::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n")); @@ -256,7 +256,7 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin() } RtecEventChannelAdmin::ProxyPushSupplier_ptr -FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -287,7 +287,7 @@ FTEC_Gateway_SupplierAdmin::~FTEC_Gateway_SupplierAdmin() // = The RtecEventChannelAdmin::SupplierAdmin methods... RtecEventChannelAdmin::ProxyPushConsumer_ptr -FTEC_Gateway_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FTEC_Gateway_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId** remote_proxy_oid_ptr; @@ -306,17 +306,17 @@ ACE_THROW_SPEC ((CORBA::SystemException)) PortableServer::ObjectId** -get_remote_oid_ptr(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USED) +get_remote_oid_ptr(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) { PortableServer::Current_var current = resolve_init<PortableServer::Current>(orb, "POACurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); PortableServer::ObjectId_var object_id = current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); PortableServer::ObjectId** result; memcpy(&result, &object_id[0], sizeof(PortableServer::ObjectId**)); @@ -339,7 +339,7 @@ FTEC_Gateway_ProxyPushSupplier::~FTEC_Gateway_ProxyPushSupplier() void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)) @@ -352,7 +352,7 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer ( ACE_CHECK; } -void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER); @@ -363,7 +363,7 @@ void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_AR delete oid_ptr; } -void FTEC_Gateway_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void FTEC_Gateway_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER); @@ -372,7 +372,7 @@ void FTEC_Gateway_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL ACE_CHECK; } -void FTEC_Gateway_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void FTEC_Gateway_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER); @@ -396,7 +396,7 @@ FTEC_Gateway_ProxyPushConsumer::~FTEC_Gateway_ProxyPushConsumer() // = The RtecEventChannelAdmin::ProxyPushConsumer methods... void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER); @@ -404,21 +404,22 @@ void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data /* if (CORBA::is_nil(impl_->push_handler.in())) { - impl_->push_handler = impl_->push_handler_servant._this(); + impl_->push_handler = impl_->push_handler_servant._this(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; } impl_->ftec->sendc_push (impl_->push_handler.in(), **oid_ptr, data ACE_ENV_ARG_PARAMETER); */ - impl_->ftec->push(**oid_ptr, data); + impl_->ftec->push(**oid_ptr, data ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)) { @@ -428,7 +429,7 @@ void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier ( ACE_CHECK; } -void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER); @@ -447,12 +448,12 @@ PushConsumerHandler::~PushConsumerHandler() { } -void PushConsumerHandler::push () +void PushConsumerHandler::push (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } -void PushConsumerHandler::push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder) +void PushConsumerHandler::push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(excep_holder); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl index 2a49f83cbae..e8175e14573 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl @@ -5,6 +5,6 @@ namespace TAO_FTRTEC { FTEC_Gateway::_this(ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var poa = _default_POA(); - return activate(poa.in()); + return activate(poa.in() ACE_ENV_ARG_PARAMETER); } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h index 7a80a82a28b..18911b9e978 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h @@ -22,11 +22,11 @@ activate_object_with_id (T * &result, poa->activate_object_with_id(oid, servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(T::_nil()); + ACE_CHECK; CORBA::Object_var object = poa-> id_to_reference(oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(T::_nil()); + ACE_CHECK; result = T::_narrow(object.in() ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index 7a2f3049b87..d7e13b112be 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -16,7 +16,7 @@ PushConsumer_impl::PushConsumer_impl(CORBA::ORB_ptr orb) void PushConsumer_impl::push (const RtecEventComm::EventSet & event - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -29,14 +29,13 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event TimeBase::TimeT elaps = time_val.sec () * 10000000 + time_val.usec ()* 10 - event[0].header.ec_send_time; event[0].data.any_value >>= x; - printf("Received data : %d, single trip time = %d usec\n", x, static_cast<long>(elaps/10)); + printf("Received data : %d, single trip time = %d usec\n", x, static_cast<int>(elaps/10)); } } void -PushConsumer_impl::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) +PushConsumer_impl::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h index d84080a2eac..b7daa9f35bd 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h @@ -22,14 +22,14 @@ public: virtual void push ( const RtecEventComm::EventSet & data - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void disconnect_push_consumer ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index c3542fa1a78..66d1da17a73 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -50,12 +50,12 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel ACE_ ACE_DEBUG((LM_DEBUG, "for_suppliers\n")); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = channel->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); - ACE_DEBUG((LM_DEBUG, "obtain_push_consumer\n")); + ACE_DEBUG((LM_DEBUG, "obtain_push_consumer\n")); consumer_ = supplier_admin->obtain_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); @@ -91,7 +91,7 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel ACE_ void PushSupplier_impl::disconnect_push_supplier ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -133,6 +133,7 @@ int PushSupplier_impl::handle_timeout (const ACE_Time_Value ¤t_time, event[0].data.any_value <<= seq_no_; consumer_->push(event ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "sending data %d\n", seq_no_)); ++seq_no_; } diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h index a425411e6df..350a7d96708 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h @@ -32,7 +32,7 @@ public: int init(RtecEventChannelAdmin::EventChannel_ptr ACE_ENV_ARG_DECL); virtual void disconnect_push_supplier ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp index f77c0f2e3ad..1140f322cad 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp @@ -37,10 +37,10 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) { CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); } break; case 'n': @@ -68,12 +68,12 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) CosNaming::NamingContext_var naming_context = resolve_init<CosNaming::NamingContext>(orb.in(), "NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); channel = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(), name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); } if (use_gateway) @@ -88,9 +88,9 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) int main(int argc, ACE_TCHAR** argv) { ACE_TRY_NEW_ENV { - orb = CORBA::ORB_init(argc, argv + orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER); @@ -141,11 +141,10 @@ int main(int argc, ACE_TCHAR** argv) } ACE_CATCHANY { ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred."); + return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN(-1); - return 0; } diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index 1bfae5f5b04..932b35c6f81 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -37,10 +37,10 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) { CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); } break; case 'n': @@ -73,12 +73,12 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) CosNaming::NamingContext_var naming_context = resolve_init<CosNaming::NamingContext>(orb.in(), "NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); channel = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(), name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN(0); } if (use_gateway) @@ -96,9 +96,9 @@ int main(int argc, ACE_TCHAR** argv) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - orb = CORBA::ORB_init(argc, argv - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb = CORBA::ORB_init(argc, argv, "" + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel |