diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent')
26 files changed, 49 insertions, 176 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index 02f47b5c48b..887b373af45 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -89,14 +89,12 @@ TAO_CEC_ConsumerAdmin::shutdown (void) CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_CEC_ConsumerAdmin::obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->pull_admin_.obtain (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 3f85a431cb5..24f70ef42d3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -83,11 +83,9 @@ public: // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier (void); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_supplier (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index f5ae3599809..96a058330cc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -22,7 +22,6 @@ TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void) // The DSI invoke request void TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Trap the _is_a request if (ACE_OS::strcmp ("_is_a", request->operation () ) == 0) @@ -67,7 +66,6 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request) CORBA::RepositoryId TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::ObjectId &, PortableServer::POA_ptr) - ACE_THROW_SPEC (()) { return CORBA::string_dup (repository_id_); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h index dbaf7a259b7..e4e0257a061 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h @@ -42,17 +42,13 @@ public: virtual ~TAO_CEC_DynamicImplementationServer (void); // = The DynamicImplementation methods. - virtual void invoke (CORBA::ServerRequest_ptr request) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke (CORBA::ServerRequest_ptr request); virtual CORBA::RepositoryId _primary_interface ( const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ) - ACE_THROW_SPEC (()); + PortableServer::POA_ptr poa); - virtual PortableServer::POA_ptr _default_POA ( - ); + virtual PortableServer::POA_ptr _default_POA (void); // Handles the _is_a call virtual void is_a (CORBA::ServerRequest_ptr request); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 3decba50304..dfdf410281a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -181,21 +181,18 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier) CosEventChannelAdmin::ConsumerAdmin_ptr TAO_CEC_EventChannel::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->consumer_admin_->_this (); } CosEventChannelAdmin::SupplierAdmin_ptr TAO_CEC_EventChannel::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->supplier_admin_->_this (); } void TAO_CEC_EventChannel::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index d26f2731cea..3154f1c4fde 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -231,18 +231,15 @@ public: /// The default implementation is: /// this->consumer_admin ()->_this (env); virtual CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); /// The default implementation is: /// this->supplier_admin ()->_this (env); virtual CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_suppliers (void); /// Commit suicide. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); ServantRetryMap& get_servant_retry_map (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index e2259d6df85..e8f7e35a480 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -82,7 +82,6 @@ CORBA::Object_ptr TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 4af10142439..81e5490e03a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -59,8 +59,7 @@ public: */ virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - ACE_TCHAR *argv[]) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_TCHAR *argv[]); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 53a57550bd7..de916724b81 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -45,7 +45,6 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void) void TAO_CEC_ProxyPullConsumer::activate ( CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullConsumer_var result; try @@ -61,7 +60,6 @@ TAO_CEC_ProxyPullConsumer::activate ( void TAO_CEC_ProxyPullConsumer::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -259,8 +257,6 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( CosEventComm::PullSupplier_ptr pull_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)) { // Nil PullSuppliers are illegal if (CORBA::is_nil (pull_supplier)) @@ -334,7 +330,6 @@ TAO_CEC_ProxyPullConsumer::apply_policy (CosEventComm::PullSupplier_ptr pre) void TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PullSupplier_var supplier; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 4ef91c2091b..aad8a9365cd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -58,12 +58,10 @@ public: /// Activate in the POA virtual void activate ( - CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /// Return 0 if no supplier is connected... CORBA::Boolean is_connected (void) const; @@ -92,11 +90,8 @@ public: // = The CosEventChannelAdmin::ProxyPullConsumer methods... virtual void connect_pull_supplier ( - CosEventComm::PullSupplier_ptr pull_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventComm::PullSupplier_ptr pull_supplier); + virtual void disconnect_pull_consumer (void); // = The Servant methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 787ab1a4bdb..5863632eeab 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -44,7 +44,6 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void) void TAO_CEC_ProxyPullSupplier::activate ( CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullSupplier_var result; try @@ -60,7 +59,6 @@ TAO_CEC_ProxyPullSupplier::activate ( void TAO_CEC_ProxyPullSupplier::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -157,8 +155,6 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event) CORBA::Any * TAO_CEC_ProxyPullSupplier::pull (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventComm::Disconnected)) { if (this->is_connected () == 0) throw CosEventComm::Disconnected (); @@ -178,7 +174,6 @@ TAO_CEC_ProxyPullSupplier::pull (void) CORBA::Any * TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { has_event = 0; if (this->is_connected () == 0) @@ -233,8 +228,6 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( CosEventComm::PullConsumer_ptr pull_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)) { { ACE_GUARD_THROW_EX ( @@ -304,7 +297,6 @@ TAO_CEC_ProxyPullSupplier::apply_policy (CosEventComm::PullConsumer_ptr pre) void TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PullConsumer_var consumer; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 534549e1859..159be9c7807 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -65,12 +65,10 @@ public: /// Activate in the POA virtual void activate ( - CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected (void) const; @@ -98,15 +96,10 @@ public: // = The CosEventChannelAdmin::ProxyPullSupplier methods... virtual void connect_pull_consumer ( - CosEventComm::PullConsumer_ptr pull_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)); - virtual CORBA::Any * pull (void) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event) - ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual void disconnect_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventComm::PullConsumer_ptr pull_consumer); + virtual CORBA::Any * pull (void); + virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event); + virtual void disconnect_pull_supplier (void); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index 6fad8240c31..57d981a8c27 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -45,7 +45,6 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void) void TAO_CEC_ProxyPushConsumer::activate ( CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushConsumer_var result; try @@ -61,7 +60,6 @@ TAO_CEC_ProxyPushConsumer::activate ( void TAO_CEC_ProxyPushConsumer::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -174,8 +172,6 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPushConsumer::connect_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)) { { ACE_GUARD_THROW_EX ( @@ -247,7 +243,6 @@ TAO_CEC_ProxyPushConsumer::apply_policy (CosEventComm::PushSupplier_ptr pre) void TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -261,7 +256,6 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event) void TAO_CEC_ProxyPushConsumer::disconnect_push_consumer () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushSupplier_var supplier; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 9ea04838f5d..3bf07075cd9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -60,12 +60,10 @@ public: /// Activate in the POA virtual void activate ( - CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /// Return false if no supplier is connected... CORBA::Boolean is_connected (void) const; @@ -90,13 +88,9 @@ public: // = The CosEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( - CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)); - virtual void push (const CORBA::Any& event) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventComm::PushSupplier_ptr push_supplier); + virtual void push (const CORBA::Any& event); + virtual void disconnect_push_consumer (void); // = The Servant methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index cab237cbb77..4e964d3c8e7 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -98,7 +98,6 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void) void TAO_CEC_ProxyPushSupplier::activate ( CosEventChannelAdmin::ProxyPushSupplier_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_var result; try @@ -114,7 +113,6 @@ TAO_CEC_ProxyPushSupplier::activate ( void TAO_CEC_ProxyPushSupplier::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -330,9 +328,6 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPushSupplier::connect_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError)) { // Nil PushConsumers are illegal if (CORBA::is_nil (push_consumer)) @@ -512,7 +507,6 @@ TAO_CEC_ProxyPushSupplier::apply_policy void TAO_CEC_ProxyPushSupplier::disconnect_push_supplier () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushConsumer_var consumer; #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index a5f7531a37b..606bd52b2e5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -76,12 +76,10 @@ public: /// Activate in the POA virtual void activate ( - CosEventChannelAdmin::ProxyPushSupplier_ptr &) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventChannelAdmin::ProxyPushSupplier_ptr &); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected (void) const; @@ -122,12 +120,8 @@ public: // = The CosEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( - CosEventComm::PushConsumer_ptr push_consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected, - CosEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosEventComm::PushConsumer_ptr push_consumer); + virtual void disconnect_push_supplier (void); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index a0c900ff46a..1f77e5ecdba 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -82,14 +82,12 @@ TAO_CEC_SupplierAdmin::shutdown (void) CosEventChannelAdmin::ProxyPushConsumer_ptr TAO_CEC_SupplierAdmin::obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_CEC_SupplierAdmin::obtain_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->pull_admin_.obtain (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 8712301644f..c189bcc064c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -81,11 +81,9 @@ public: // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_consumer (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index 5a6615e297d..17086f22b0c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -29,7 +29,6 @@ TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin (void) void TAO_CEC_TypedConsumerAdmin::invoke (const TAO_CEC_TypedEvent& typed_event) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_CEC_Propagate_Typed_Event typed_event_worker (typed_event, this->typed_event_channel_); @@ -64,10 +63,6 @@ CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier ( const char * /*supported_interface*/ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosTypedEventChannelAdmin::InterfaceNotSupported - )) { throw CosTypedEventChannelAdmin::InterfaceNotSupported (); } @@ -76,10 +71,6 @@ CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier ( const char * uses_interface ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosTypedEventChannelAdmin::NoSuchImplementation - )) { // Register the consumer uses_interface with the EC @@ -95,14 +86,12 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier ( CosEventChannelAdmin::ProxyPushSupplier_ptr TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 45b8002f12b..7c39f234645 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -49,8 +49,7 @@ public: void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker); /// Invoke the typed event on all the consumers - virtual void invoke (const TAO_CEC_TypedEvent& typed_event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke (const TAO_CEC_TypedEvent& typed_event); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. @@ -64,22 +63,16 @@ public: // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_typed_push_supplier (const char * uses_interface) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTypedEventChannelAdmin::NoSuchImplementation)); + obtain_typed_push_supplier (const char * uses_interface); virtual CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr - obtain_typed_pull_supplier (const char * supported_interface) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTypedEventChannelAdmin::InterfaceNotSupported)); + obtain_typed_pull_supplier (const char * supported_interface); // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_supplier (void); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_supplier (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index aa0da5850e8..f3f41ddcd7c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -526,21 +526,18 @@ TAO_CEC_TypedEventChannel::create_list (CORBA::Long count, // The CosTypedEventChannelAdmin::TypedEventChannel methods... CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr TAO_CEC_TypedEventChannel::for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->typed_consumer_admin_->_this (); } CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr TAO_CEC_TypedEventChannel::for_suppliers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->typed_supplier_admin_->_this (); } void TAO_CEC_TypedEventChannel::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (!destroyed_) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 10cf213a0fd..be8c2d6d59f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -247,15 +247,12 @@ public: // = The CosTypedEventChannelAdmin::TypedEventChannel methods... virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr - for_consumers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + for_consumers (void); virtual ::CosTypedEventChannelAdmin::TypedSupplierAdmin_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); ServantRetryMap& get_servant_retry_map (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index 44490753e28..97110286488 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -74,7 +74,6 @@ TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void) void TAO_CEC_TypedProxyPushConsumer::activate ( CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosTypedEventChannelAdmin::TypedProxyPushConsumer_var result; try @@ -90,7 +89,6 @@ TAO_CEC_TypedProxyPushConsumer::activate ( void TAO_CEC_TypedProxyPushConsumer::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -204,8 +202,6 @@ TAO_CEC_TypedProxyPushConsumer::_decr_refcnt (void) void TAO_CEC_TypedProxyPushConsumer::connect_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)) { { ACE_GUARD_THROW_EX ( @@ -275,14 +271,12 @@ TAO_CEC_TypedProxyPushConsumer::apply_policy void TAO_CEC_TypedProxyPushConsumer::push (const CORBA::Any& /* event */) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer () - ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushSupplier_var supplier; @@ -340,7 +334,6 @@ TAO_CEC_TypedProxyPushConsumer::_remove_ref (void) CORBA::Object_ptr TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var server = @@ -351,7 +344,6 @@ TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void) void TAO_CEC_TypedProxyPushConsumer::invoke (const TAO_CEC_TypedEvent& typed_event) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_CEC_TypedProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 6f8b2e53b07..547df4ccbfd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -51,12 +51,10 @@ public: /// Activate in the POA virtual void activate ( - CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy); /// Deactivate from the POA - virtual void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deactivate (void); /** * Invoke the _non_existent() pseudo-operation on the supplier. If @@ -74,23 +72,17 @@ public: // = The CosEventChannelAdmin::ProxyPushConsumer methods (abstract overloads)... virtual void connect_push_supplier ( - CosEventComm::PushSupplier_ptr push_supplier) - ACE_THROW_SPEC ((CORBA::SystemException, - CosEventChannelAdmin::AlreadyConnected)); + CosEventComm::PushSupplier_ptr push_supplier); - virtual void push (const CORBA::Any& event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const CORBA::Any& event); - virtual void invoke (const TAO_CEC_TypedEvent& typed_event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke (const TAO_CEC_TypedEvent& typed_event); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)... virtual CORBA::Object_ptr get_typed_consumer ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); // = The Servant methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index e978f362023..0f075e4bef4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -58,10 +58,6 @@ CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer ( const char * supported_interface ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosTypedEventChannelAdmin::InterfaceNotSupported - )) { int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface); @@ -78,10 +74,6 @@ CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer ( const char * /* uses_interface */ ) - ACE_THROW_SPEC (( - CORBA::SystemException, - CosTypedEventChannelAdmin::NoSuchImplementation - )) { throw CosTypedEventChannelAdmin::NoSuchImplementation (); @@ -89,14 +81,12 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer ( CosEventChannelAdmin::ProxyPushConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullConsumer_ptr TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index a804e384981..7a12d3e759a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -57,23 +57,17 @@ public: // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods... virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr - obtain_typed_push_consumer (const char * supported_interface) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTypedEventChannelAdmin::InterfaceNotSupported)); + obtain_typed_push_consumer (const char * supported_interface); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_typed_pull_consumer (const char * uses_interface) - ACE_THROW_SPEC ((CORBA::SystemException, - CosTypedEventChannelAdmin::NoSuchImplementation)); + obtain_typed_pull_consumer (const char * uses_interface); // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_push_consumer (void); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain_pull_consumer (void); // = The PortableServer::ServantBase methods virtual PortableServer::POA_ptr _default_POA (void); |