Mon Feb 12 13:41:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 5 insertions, 45 deletions

diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index 4eaa9a6bf19..1ca418ff98c 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -433,10 +433,6 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault
 void TAO::FT_FaultDetectorFactory_i::change_properties (
     const PortableGroup::Properties & property_set
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::InvalidProperty
-  ))
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::change_properties);
 
@@ -471,9 +467,6 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
 }
 
 void TAO::FT_FaultDetectorFactory_i::shutdown (void)
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::shutdown);
   InternalGuard guard (this->internals_);
@@ -487,14 +480,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::NoFactory
-    , PortableGroup::ObjectNotCreated
-    , PortableGroup::InvalidCriteria
-    , PortableGroup::InvalidProperty
-    , PortableGroup::CannotMeetCriteria
-  ))
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::create_object);
 
@@ -647,10 +632,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
 void TAO::FT_FaultDetectorFactory_i::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , PortableGroup::ObjectNotFound
-  ))
 {
   METHOD_ENTRY(TAO::FT_FaultDetectorFactory_i::delete_object);
 
@@ -677,7 +658,6 @@ void TAO::FT_FaultDetectorFactory_i::delete_object (
 }
 
 CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::is_alive)
     1;
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index f6e9fa59a07..289fc1ae775 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -156,16 +156,9 @@ namespace TAO
     // CORBA interface FaultDetectorFactory methods
     virtual void change_properties (
         const PortableGroup::Properties & property_set
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableGroup::InvalidProperty
-      ));
+      );
 
-    virtual void shutdown (void)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    virtual void shutdown (void);
 
     /////////////////////////////////////////
     // CORBA interface GenericFactory methods
@@ -173,29 +166,16 @@ namespace TAO
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-      , PortableGroup::NoFactory
-      , PortableGroup::ObjectNotCreated
-      , PortableGroup::InvalidCriteria
-      , PortableGroup::InvalidProperty
-      , PortableGroup::CannotMeetCriteria
-    ));
+    );
 
     virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-      , PortableGroup::ObjectNotFound
-    ));
+    );
 
     //////////////////////////////////////////
     // CORBA interface PullMonitorable methods
 
-    virtual CORBA::Boolean is_alive (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Boolean is_alive (void);
 
     /////////////////////////
     // Implementation methods