1 files changed, 2 insertions, 24 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 0212a144027..28e30ac982b 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -69,9 +69,6 @@ StructuredPushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -135,8 +132,6 @@ StructuredPushConsumer_i::check_serial_number (CORBA::ULong seq)
 void
 StructuredPushConsumer_i::push_structured_event (
         const CosNotification::StructuredEvent & notification)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-        CosEventComm::Disconnected))
 {
   this->received_ += 1;
   if (this->received_ == this->expect_ + 1)
@@ -227,7 +222,6 @@ StructuredPushConsumer_i::push_structured_event (
 void
 StructuredPushConsumer_i::disconnect_structured_push_consumer (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) StructuredPushConsumer received disconnect\n")
@@ -288,9 +282,6 @@ SequencePushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -354,8 +345,6 @@ void
 SequencePushConsumer_i::push_structured_events (
       const CosNotification::EventBatch & notifications
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-      CosEventComm::Disconnected))
 {
   size_t batch_size = notifications.length();
   if (this->verbose_)
@@ -446,7 +435,6 @@ SequencePushConsumer_i::push_structured_events (
 void
 SequencePushConsumer_i::disconnect_sequence_push_consumer (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) SequencePushConsumer received disconnect\n")
@@ -507,9 +495,6 @@ AnyPushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -573,8 +558,6 @@ void
 AnyPushConsumer_i::push (
         const CORBA::Any & data
       )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-        CosEventComm::Disconnected))
 {
   this->received_ += 1;
   if (this->received_ == this->expect_ + 1)
@@ -656,7 +639,6 @@ AnyPushConsumer_i::push (
 void
 AnyPushConsumer_i::disconnect_push_consumer (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) AnyPushConsumer received disconnect\n")
@@ -680,9 +662,7 @@ ReconnectionCallback_i::reconnect_count () const
 }
 
 void
-ReconnectionCallback_i::reconnect (
-    CORBA::Object_ptr reconnection
-  ) ACE_THROW_SPEC ((CORBA::SystemException))
+ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection)
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Consumer received reconnection request\n")
@@ -703,9 +683,8 @@ ReconnectionCallback_i::reconnect (
 
 CORBA::Boolean
 ReconnectionCallback_i::is_alive (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return CORBA::Boolean (1);
+  return true;
 }
 
 
@@ -1087,7 +1066,6 @@ Consumer_Main::load_ids()
 void
 Consumer_Main::reconnect (
     CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->verbose_)
   {