1 files changed, 0 insertions, 19 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 26812db99ae..c3685075726 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -61,9 +61,6 @@ TAO_Notify_EventChannelFactory::~TAO_Notify_EventChannelFactory ()
 
 void
 TAO_Notify_EventChannelFactory::destroy (void)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   int result = this->shutdown ();
   if ( result == 1)
@@ -168,11 +165,6 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (void)
     const CosNotification::AdminProperties & initial_admin,
     CosNotifyChannelAdmin::ChannelID_out id
   )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotification::UnsupportedQoS
-                   , CosNotification::UnsupportedAdmin
-                   ))
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
     TAO_Notify_PROPERTIES::instance()->builder()->build_event_channel (this
@@ -185,9 +177,6 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (void)
 
 CosNotifyChannelAdmin::ChannelIDSeq*
 TAO_Notify_EventChannelFactory::get_all_channels (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   TAO_Notify_EventChannel_Seq_Worker seq_worker;
 
@@ -196,10 +185,6 @@ TAO_Notify_EventChannelFactory::get_all_channels (void)
 
 CosNotifyChannelAdmin::EventChannel_ptr
 TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::ChannelID id)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   , CosNotifyChannelAdmin::ChannelNotFound
-                   ))
 {
   TAO_Notify_EventChannel_Find_Worker find_worker;
 
@@ -400,7 +385,6 @@ TAO_Notify_EventChannelFactory::reconnect (void)
 NotifyExt::ReconnectionRegistry::ReconnectionID
 TAO_Notify_EventChannelFactory::register_callback (
     NotifyExt::ReconnectionCallback_ptr reconnection)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->reconnect_registry_.register_callback (
     reconnection);
@@ -409,7 +393,6 @@ TAO_Notify_EventChannelFactory::register_callback (
 void
 TAO_Notify_EventChannelFactory::unregister_callback (
     NotifyExt::ReconnectionRegistry::ReconnectionID id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->reconnect_registry_.unregister_callback (
     id);
@@ -417,14 +400,12 @@ TAO_Notify_EventChannelFactory::unregister_callback (
 
 CORBA::Boolean
 TAO_Notify_EventChannelFactory::is_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Boolean (1);
 }
 
 void
 TAO_Notify_EventChannelFactory::save_topology (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->self_change ();
 }