ChangeLogTag:Sun Jun 13 21:46:25 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

4 files changed, 33 insertions, 7 deletions

diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 93118609611..1c6c3a6b62d 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -300,18 +300,21 @@ Event_Service::parse_args (int argc, char *argv [])
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 Event_Service::for_consumers (CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ec_impl_->for_consumers (ACE_TRY_ENV);
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 Event_Service::for_suppliers (CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ec_impl_->for_suppliers (ACE_TRY_ENV);
 }
 
 void
 Event_Service::destroy (CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->ec_impl_->destroy (ACE_TRY_ENV);
   ACE_CHECK;
@@ -321,6 +324,10 @@ Event_Service::destroy (CORBA::Environment &ACE_TRY_ENV)
 RtecEventChannelAdmin::Observer_Handle
 Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer,
                                 CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
+          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   return this->ec_impl_->append_observer (observer, ACE_TRY_ENV);
 }
@@ -328,6 +335,10 @@ Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer,
 void
 Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle,
                                 CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
+          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   this->ec_impl_->remove_observer (handle, ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index b88ac45abe7..89de50f53be 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -42,15 +42,26 @@ public:
 
   // = The RtecEventChannelAdmin::Event_Channel methods
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (CORBA::Environment &);
+    for_consumers (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (CORBA::Environment &);
-  virtual void destroy (CORBA::Environment &);
+    for_suppliers (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-                     CORBA::Environment &env);
+                     CORBA::Environment &env)
+      ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
+          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle,
-                                CORBA::Environment &env);
+                                CORBA::Environment &env)
+      ACE_THROW_SPEC ((
+          CORBA::SystemException,
+          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
+          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
 
 private:
   int parse_args (int argc, char* argv[]);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 235306bb1ca..d9b3c321ec2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -122,6 +122,7 @@ Test_Consumer::accumulate (ECT_Driver::Latency_Stats& stats) const
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events,
                      CORBA::Environment &TAO_IN_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -180,6 +181,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 Test_Consumer::disconnect_push_consumer (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index e66f3185cbc..13b6eb2a249 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -59,8 +59,10 @@ public:
   // Add our latency statistics to <stats>
 
   virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env);
-  virtual void disconnect_push_consumer (CORBA::Environment &);
+                     CORBA::Environment &_env)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
 private: