diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent')
32 files changed, 90 insertions, 374 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp index 3c74fec8208..de912b10127 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp @@ -17,14 +17,12 @@ FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth) void FTRT_ClientORB_Initializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FTRT_ClientORB_Initializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { info->add_client_request_interceptor (client_interceptor_.in()); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h index 355ff4bb270..3c46e040344 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h @@ -42,11 +42,9 @@ public: /// Priority mapping types FTRT_ClientORB_Initializer (int transaction_depth); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: PortableInterceptor::ClientRequestInterceptor_var client_interceptor_; }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 054fe0838e3..0776f22a784 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -30,29 +30,24 @@ FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor (void) char * FTRT_ClientORB_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void FTRT_ClientORB_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FTRT_ClientORB_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FTRT_ClientORB_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ACE_TRACE("FTRT_ClientORB_Interceptor::send_request"); try @@ -98,7 +93,6 @@ FTRT_ClientORB_Interceptor::send_request ( void FTRT_ClientORB_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRACE("FTRT_ClientORB_Interceptor::receive_reply"); @@ -133,16 +127,12 @@ FTRT_ClientORB_Interceptor::receive_reply ( void FTRT_ClientORB_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void FTRT_ClientORB_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h index 304a186c184..e1eb6fa03ef 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h @@ -47,29 +47,19 @@ public: virtual ~FTRT_ClientORB_Interceptor (); /// Canonical name of the interceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; CORBA::Long transaction_depth_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index 83d7e6c3079..208494e8db1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -30,7 +30,6 @@ TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void) RtecEventChannelAdmin::ProxyPushSupplier_ptr TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG,"obtain_push_supplier\n" )); return obtain_proxy(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h index dbaf815d55e..80aedc2752a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -61,8 +61,7 @@ public: // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier (void); void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj); }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index 391cc4d77e5..45467d61e82 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -140,11 +140,6 @@ 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_THROW_SPEC (( - CORBA::SystemException - , FTRT::InvalidUpdate - , FTRT::OutOfSequence - )) { ec_impl_->set_update(s); } @@ -152,9 +147,6 @@ void TAO_FTEC_Event_Channel::set_update ( void TAO_FTEC_Event_Channel::oneway_set_update ( const FTRT::State & s ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->set_update(s); } @@ -162,14 +154,12 @@ void TAO_FTEC_Event_Channel::oneway_set_update ( RtecEventChannelAdmin::ConsumerAdmin_ptr TAO_FTEC_Event_Channel::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ec_impl_->for_consumers(); } RtecEventChannelAdmin::SupplierAdmin_ptr TAO_FTEC_Event_Channel::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ec_impl_->for_suppliers(); } @@ -177,7 +167,6 @@ TAO_FTEC_Event_Channel::for_suppliers (void) void TAO_FTEC_Event_Channel::set_state (const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState)) { ACE_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n")); ec_impl_->set_state(s); @@ -185,7 +174,6 @@ TAO_FTEC_Event_Channel::set_state (const FTRT::State & s) void TAO_FTEC_Event_Channel::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Fault_Detector::instance()) Fault_Detector::instance()->stop(); @@ -196,10 +184,6 @@ TAO_FTEC_Event_Channel::destroy (void) RtecEventChannelAdmin::Observer_Handle TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { /// we have yet to implement the replication of observers /// throw an exception for the moment @@ -210,10 +194,6 @@ TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr) void TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { /// we have yet to implement the replication of observers /// throw an exception for the moment @@ -229,9 +209,6 @@ TAO_FTEC_Event_Channel::start ( FTRT::FaultListener_ptr listener, FTRT::Location_out location ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return ec_impl_->start(listener, location); } @@ -241,10 +218,6 @@ TAO_FTEC_Event_Channel::create_group ( const FTRT::ManagerInfoList & info_list, CORBA::ULong object_group_ref_version ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FTRT::PredecessorUnreachable - )) { ec_impl_->create_group(info_list, object_group_ref_version); } @@ -253,9 +226,6 @@ void TAO_FTEC_Event_Channel::join_group ( const FTRT::ManagerInfo & info ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->join_group(info); } @@ -265,9 +235,6 @@ TAO_FTEC_Event_Channel::add_member ( const FTRT::ManagerInfo & info, CORBA::ULong object_group_ref_version ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->add_member(info, object_group_ref_version); } @@ -276,9 +243,6 @@ void TAO_FTEC_Event_Channel::remove_member ( const FTRT::Location & crashed_location, CORBA::ULong object_group_ref_version) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->remove_member(crashed_location, object_group_ref_version); @@ -288,9 +252,6 @@ void TAO_FTEC_Event_Channel::replica_crashed ( const FTRT::Location & location ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->replica_crashed(location); } @@ -303,10 +264,6 @@ TAO_FTEC_Event_Channel::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS & qos ) - ACE_THROW_SPEC (( - CORBA::SystemException - , RtecEventChannelAdmin::TypeError - )) { return ec_impl_->connect_push_consumer(push_consumer, qos); } @@ -317,9 +274,6 @@ TAO_FTEC_Event_Channel::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS & qos ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return ec_impl_->connect_push_supplier(push_supplier, qos); @@ -329,9 +283,6 @@ void TAO_FTEC_Event_Channel::disconnect_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->disconnect_push_supplier(oid); } @@ -340,9 +291,6 @@ void TAO_FTEC_Event_Channel::disconnect_push_consumer ( const FtRtecEventChannelAdmin::ObjectId & oid ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ec_impl_->disconnect_push_consumer(oid); } @@ -351,10 +299,6 @@ void TAO_FTEC_Event_Channel::suspend_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FtRtecEventComm::InvalidObjectID - )) { ec_impl_->suspend_push_supplier(oid); } @@ -363,10 +307,6 @@ void TAO_FTEC_Event_Channel::resume_push_supplier ( const FtRtecEventChannelAdmin::ObjectId & oid ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FtRtecEventComm::InvalidObjectID - )) { ec_impl_->resume_push_supplier(oid); } @@ -376,10 +316,6 @@ TAO_FTEC_Event_Channel::push ( const FtRtecEventChannelAdmin::ObjectId & oid, const RtecEventComm::EventSet & data ) - ACE_THROW_SPEC (( - CORBA::SystemException - , FtRtecEventComm::InvalidObjectID - )) { ec_impl_->push(oid, data); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index a82b2fddcc8..d38754f62a2 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -64,82 +64,63 @@ public: /// RtecEventChannelAdmin::EventChannel Interface virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); + append_observer (RtecEventChannelAdmin::Observer_ptr observer); - virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle) - ACE_THROW_SPEC ((CORBA::SystemException,RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); + virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle); /// EventChannelFacade Interface, used by FTEC gateway virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS & qos) - ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::TypeError)) ; + const RtecEventChannelAdmin::ConsumerQOS & qos); virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS & qos) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + const RtecEventChannelAdmin::SupplierQOS & qos); virtual void disconnect_push_supplier ( - const FtRtecEventChannelAdmin::ObjectId & oid) - ACE_THROW_SPEC ((CORBA::SystemException)); + const FtRtecEventChannelAdmin::ObjectId & oid); virtual void disconnect_push_consumer ( - const FtRtecEventChannelAdmin::ObjectId & oid) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + const FtRtecEventChannelAdmin::ObjectId & oid); virtual void suspend_push_supplier ( - const FtRtecEventChannelAdmin::ObjectId & oid) - ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)); + const FtRtecEventChannelAdmin::ObjectId & oid); virtual void resume_push_supplier ( - const FtRtecEventChannelAdmin::ObjectId & oid) - ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)) ; + const FtRtecEventChannelAdmin::ObjectId & oid); virtual void push ( const FtRtecEventChannelAdmin::ObjectId & oid, - const RtecEventComm::EventSet & data) - ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)); + const RtecEventComm::EventSet & data); /// FTRT::GroupManager Interfaces /// These are used for inter-replica communications void set_state ( - const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState)); + const FTRT::State & s); - virtual void set_update (const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate, FTRT::OutOfSequence)); + virtual void set_update (const FTRT::State & s); - virtual void oneway_set_update (const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void oneway_set_update (const FTRT::State & s); virtual CORBA::Boolean start ( FTRT::FaultListener_ptr listener, - FTRT::Location_out cur) - ACE_THROW_SPEC ((CORBA::SystemException)); + FTRT::Location_out cur); virtual void create_group ( const FTRT::ManagerInfoList & info_list, - CORBA::ULong object_group_ref_version) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::PredecessorUnreachable)) ; + CORBA::ULong object_group_ref_version); virtual void join_group ( const FTRT::ManagerInfo & info @@ -147,17 +128,14 @@ public: virtual void add_member ( const FTRT::ManagerInfo & info, - CORBA::ULong object_group_ref_version) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + CORBA::ULong object_group_ref_version); virtual void remove_member ( const FTRT::Location & crashed_location, - CORBA::ULong object_group_ref_version) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong object_group_ref_version); virtual void replica_crashed ( - const FTRT::Location & location) - ACE_THROW_SPEC ((CORBA::SystemException)) ; + const FTRT::Location & location); private: 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 5171b434179..0a871bebfdf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -234,7 +234,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( /// this->consumer_admin ()->_this (); RtecEventChannelAdmin::ConsumerAdmin_ptr TAO_FTEC_Event_Channel_Impl::for_consumers (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = consumer_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in()); @@ -246,7 +245,6 @@ ACE_THROW_SPEC ((CORBA::SystemException)) /// this->supplier_admin ()->_this (); RtecEventChannelAdmin::SupplierAdmin_ptr TAO_FTEC_Event_Channel_Impl::for_suppliers (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = supplier_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in()); @@ -427,7 +425,6 @@ 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_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate)) { FTRTEC::Replication_Service::instance()->check_validity(); 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 6ae1dd368fd..36c72ef69f6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -49,20 +49,17 @@ public: // = The RtecEventChannelAdmin::EventChannel methods... virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); void get_state (FtRtecEventChannelAdmin::EventChannelState & s); void set_state (const FTRT::State & stat); - void set_update (const FTRT::State & s) - ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate)); + void set_update (const FTRT::State & s); /// EventChannelFacade Interface diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index 5ea216610e2..8d79ea9a362 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -61,9 +61,6 @@ CORBA::Boolean TAO_FTEC_Group_Manager::start ( FTRT::FaultListener_ptr listener, FTRT::Location_out cur ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { listener_ = listener; ACE_NEW_RETURN(cur , FTRT::Location(Fault_Detector::instance()->my_location()), false); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h index b154e25448f..97981362ac6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -35,8 +35,7 @@ public: virtual CORBA::Boolean start ( FTRT::FaultListener_ptr listener, - FTRT::Location_out cur) - ACE_THROW_SPEC ((CORBA::SystemException)); + FTRT::Location_out cur); void create_group ( const FTRT::ManagerInfoList & info_list, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 75ee7462d2b..146adb31e89 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -16,14 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void FTEC_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FTEC_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { Request_Context_Repository().allocate_slots(info); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h index 80502fc5245..877c6a26205 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h @@ -27,11 +27,9 @@ class FTEC_ORBInitializer , public virtual TAO_Local_RefCounted_Object { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp index 74aea4e3390..bbadda70bea 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -32,7 +32,6 @@ TAO_FTEC_ProxyPushConsumer::id() const void TAO_FTEC_ProxyPushConsumer::activate ( RtecEventChannelAdmin::ProxyPushConsumer_ptr &result) - ACE_THROW_SPEC ((CORBA::SystemException)) { result = RtecEventChannelAdmin::ProxyPushConsumer::_nil(); try{ @@ -51,8 +50,6 @@ TAO_FTEC_ProxyPushConsumer::activate ( void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)) { if (Request_Context_Repository().is_executed_request()) return; @@ -80,7 +77,6 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( } void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index 2e45f985862..2da0867c22f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -34,18 +34,14 @@ public: TAO_FTEC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel); virtual void activate ( - RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy); // = The RtecEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::SupplierQOS& qos); + virtual void disconnect_push_consumer (void); const FtRtecEventChannelAdmin::ObjectId& id() const; void get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index e215955c4d5..941de2b9a07 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -31,7 +31,6 @@ TAO_FTEC_ProxyPushSupplier::id() const void TAO_FTEC_ProxyPushSupplier::activate ( RtecEventChannelAdmin::ProxyPushSupplier_ptr &result) - ACE_THROW_SPEC ((CORBA::SystemException)) { result = @@ -51,9 +50,6 @@ TAO_FTEC_ProxyPushSupplier::activate ( void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)) { if (Request_Context_Repository().is_executed_request()) return; @@ -81,7 +77,6 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; @@ -100,7 +95,6 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void) void TAO_FTEC_ProxyPushSupplier::suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; @@ -126,7 +120,6 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (void) } void TAO_FTEC_ProxyPushSupplier::resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (Request_Context_Repository().is_executed_request()) return; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index 90ad86d0101..976deb54b82 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -35,21 +35,14 @@ public: int validate_connection); /// Activate in the POA virtual void activate ( - RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy); // = The RtecEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::ConsumerQOS &qos); + virtual void disconnect_push_supplier (void); + virtual void suspend_connection (void); + virtual void resume_connection (void); const FtRtecEventChannelAdmin::ObjectId& id() const; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index 7b1d6ff5b5a..cbf09a94882 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -28,7 +28,6 @@ TAO_FTEC_SupplierAdmin::~TAO_FTEC_SupplierAdmin() RtecEventChannelAdmin::ProxyPushConsumer_ptr TAO_FTEC_SupplierAdmin::obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return obtain_proxy(); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index cd1e66b26ac..4498166f2c6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -67,8 +67,7 @@ public: // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj); }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 1109d4a424b..cc29293f026 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -73,19 +73,15 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor() } char * ForwardCtrlServerInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup("ForwardCtrlServerInterceptor"); } void ForwardCtrlServerInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { try{ IOP::ServiceContext_var service_context = @@ -107,8 +103,6 @@ void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerR void ForwardCtrlServerInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } @@ -135,7 +129,6 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceContext_var service_context; FT::ObjectGroupRefVersion version=0; @@ -207,14 +200,10 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques } void ForwardCtrlServerInterceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr) - 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 533fd02215c..3bbced4d4f6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h @@ -28,31 +28,20 @@ public: ForwardCtrlServerInterceptor(); ~ForwardCtrlServerInterceptor(); - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 4d05f000f95..a863cef8ebb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -185,30 +185,24 @@ FtEventServiceInterceptor::instance() char * FtEventServiceInterceptor::name (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FtEventServiceInterceptor"); } void FtEventServiceInterceptor::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void FtEventServiceInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); if (ACE_OS::strcmp(operation.in(), "push") == 0) { @@ -257,7 +251,6 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn void FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { FT::FTRequestServiceContext ft_request_service_context; IOP::ServiceContext_var service_context; @@ -279,15 +272,11 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt void FtEventServiceInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void FtEventServiceInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr) - 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 4e7d566c74c..c362d5f67c9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -54,31 +54,20 @@ public: ~FtEventServiceInterceptor(); static FtEventServiceInterceptor* instance(); - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); void get_state(FtRtecEventChannelAdmin::CachedOptionResults& state); void set_state(const FtRtecEventChannelAdmin::CachedOptionResults& state); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp index 37a69cd8ceb..4ca242fd20a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp @@ -12,7 +12,6 @@ ObjectGroupManagerHandler::ObjectGroupManagerHandler( void ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val, const FTRT::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(ami_return_val); ACE_UNUSED_ARG(the_location); @@ -20,25 +19,21 @@ ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val, void ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ObjectGroupManagerHandler::create_group (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ObjectGroupManagerHandler::add_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (--num_backups_ ==0) evt_.signal(); @@ -46,20 +41,17 @@ ObjectGroupManagerHandler::add_member (void) void ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->add_member(); } void ObjectGroupManagerHandler::set_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index 252d0df335d..d1938c74516 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -23,29 +23,21 @@ class ObjectGroupManagerHandler public: ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups); virtual void start (CORBA::Boolean ami_return_val, - const FTRT::Location & the_location) - ACE_THROW_SPEC ((CORBA::SystemException)); + const FTRT::Location & the_location); - virtual void start_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void create_group (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void create_group (void); - virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void add_member (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void add_member (void); - virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void set_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_state (void); - virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder); private: ACE_Auto_Event& evt_; ACE_Atomic_Op< ACE_SYNCH_MUTEX, int > num_backups_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 9434df42bf9..93c0c646e52 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -22,21 +22,18 @@ TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor (void) char * TAO_Set_Update_Interceptor::name (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void TAO_Set_Update_Interceptor::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_Set_Update_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing } @@ -44,8 +41,6 @@ TAO_Set_Update_Interceptor::send_poll ( void TAO_Set_Update_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -134,23 +129,18 @@ TAO_Set_Update_Interceptor::send_request ( void TAO_Set_Update_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_Set_Update_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO_Set_Update_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h index e8f28530c9d..5823e871dab 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h @@ -47,30 +47,20 @@ public: virtual ~TAO_Set_Update_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index 5806ef940fd..826664b8a8e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -62,9 +62,6 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler) void UpdateableHandler::set_update ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_DEBUG((LM_DEBUG,"Received reply from ")); dispatch(&Update_Manager::handle_reply); @@ -72,9 +69,6 @@ void UpdateableHandler::set_update ( void UpdateableHandler::set_update_excep ( ::Messaging::ExceptionHolder * excep_holder ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_DEBUG((LM_DEBUG, "Received Exception from")); try{ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 14bb614b20d..65e04ce4026 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -37,16 +37,10 @@ public: void dispatch(Handler handler) ; virtual void set_update ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void set_update_excep ( ::Messaging::ExceptionHolder * excep_holder - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: AMI_Primary_Replication_Strategy* strategy_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index f36a3765d6c..ab7250abb9d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -24,8 +24,7 @@ public: ~FTEC_Gateway_ConsumerAdmin(); // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier (void); FTEC_Gateway_Impl* impl_; }; @@ -37,8 +36,7 @@ public: ~FTEC_Gateway_SupplierAdmin(); // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); FTEC_Gateway_Impl* impl_; }; @@ -51,16 +49,10 @@ public: // = The RtecEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::ConsumerQOS &qos); + virtual void disconnect_push_supplier (void); + virtual void suspend_connection (void); + virtual void resume_connection (void); FTEC_Gateway_Impl* impl_; }; @@ -71,16 +63,12 @@ public: FTEC_Gateway_ProxyPushConsumer(FTEC_Gateway_Impl* impl); ~FTEC_Gateway_ProxyPushConsumer(); - virtual void push (const RtecEventComm::EventSet & data) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet & data); // = The RtecEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + const RtecEventChannelAdmin::SupplierQOS& qos); + virtual void disconnect_push_consumer (void); FTEC_Gateway_Impl* impl_; }; @@ -90,11 +78,9 @@ class PushConsumerHandler : public POA_FtRtecEventComm::AMI_PushConsumerHandler public: PushConsumerHandler(); ~PushConsumerHandler(); - virtual void push (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (void); - virtual void push_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push_excep (::Messaging::ExceptionHolder * excep_holder); }; /** @@ -228,40 +214,29 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa) //= The RtecEventChannelAdmin::EventChannel methods RtecEventChannelAdmin::ConsumerAdmin_ptr FTEC_Gateway::for_consumers (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(impl_->consumer_admin.in()); } RtecEventChannelAdmin::SupplierAdmin_ptr FTEC_Gateway::for_suppliers (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n")); return RtecEventChannelAdmin::SupplierAdmin::_duplicate(impl_->supplier_admin.in()); } void FTEC_Gateway::destroy (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { impl_->ftec->destroy(); } RtecEventChannelAdmin::Observer_Handle FTEC_Gateway::append_observer (RtecEventChannelAdmin::Observer_ptr observer) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { return impl_->ftec->append_observer(observer); } void FTEC_Gateway::remove_observer (RtecEventChannelAdmin::Observer_Handle handle) - ACE_THROW_SPEC (( - CORBA::SystemException, - RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, - RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { impl_->ftec->remove_observer(handle); } @@ -291,7 +266,6 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin() RtecEventChannelAdmin::ProxyPushSupplier_ptr FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** remote_proxy_oid_ptr; @@ -322,7 +296,6 @@ FTEC_Gateway_SupplierAdmin::~FTEC_Gateway_SupplierAdmin() // = The RtecEventChannelAdmin::SupplierAdmin methods... RtecEventChannelAdmin::ProxyPushConsumer_ptr FTEC_Gateway_SupplierAdmin::obtain_push_consumer (void) -ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** remote_proxy_oid_ptr; ACE_NEW_THROW_EX(remote_proxy_oid_ptr, FtRtecEventComm::ObjectId*, CORBA::NO_MEMORY()); @@ -370,9 +343,6 @@ FTEC_Gateway_ProxyPushSupplier::~FTEC_Gateway_ProxyPushSupplier() void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected, - RtecEventChannelAdmin::TypeError)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); @@ -381,7 +351,6 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer ( } void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->disconnect_push_supplier(**oid_ptr); @@ -390,14 +359,12 @@ void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void) } void FTEC_Gateway_ProxyPushSupplier::suspend_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->suspend_push_supplier(**oid_ptr); } void FTEC_Gateway_ProxyPushSupplier::resume_connection (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->resume_push_supplier(**oid_ptr); @@ -418,7 +385,6 @@ FTEC_Gateway_ProxyPushConsumer::~FTEC_Gateway_ProxyPushConsumer() // = The RtecEventChannelAdmin::ProxyPushConsumer methods... void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); @@ -437,15 +403,12 @@ void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data) void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos) - ACE_THROW_SPEC ((CORBA::SystemException, - RtecEventChannelAdmin::AlreadyConnected)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos); } void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->disconnect_push_consumer(**oid_ptr); @@ -462,12 +425,10 @@ PushConsumerHandler::~PushConsumerHandler() } void PushConsumerHandler::push (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index 61dc86eaec3..b5c8a4673dc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -38,15 +38,12 @@ namespace TAO_FTRTEC //= The RtecEventChannelAdmin::EventChannel methods virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC((CORBA::SystemException)); + for_consumers (void); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC((CORBA::SystemException)); + for_suppliers (void); - virtual void destroy (void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void destroy (void); virtual RtecEventChannelAdmin::Observer_Handle append_observer |