Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 0 insertions, 118 deletions

diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 379e991d2f8..0de7c51671d 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -41,7 +41,6 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Acceptor_Registry.h"
 #include "tao/Thread_Lane_Resources.h"
-#include "tao/Environment.h"
 #include "tao/Exception.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
@@ -81,7 +80,6 @@ TAO_Root_POA::objectkey_prefix [TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
 
 PortableServer::ThreadPolicy_ptr
 TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ThreadPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -97,7 +95,6 @@ TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value)
 
 PortableServer::LifespanPolicy_ptr
 TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::LifespanPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -112,7 +109,6 @@ TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdUniquenessPolicy_ptr
 TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::IdUniquenessPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -126,7 +122,6 @@ TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyVal
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdAssignmentPolicy_ptr
 TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::IdAssignmentPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -141,7 +136,6 @@ TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyVal
 
 PortableServer::ImplicitActivationPolicy_ptr
 TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ImplicitActivationPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -153,7 +147,6 @@ TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivat
 
 PortableServer::ServantRetentionPolicy_ptr
 TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ServantRetentionPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -165,7 +158,6 @@ TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionP
 
 PortableServer::RequestProcessingPolicy_ptr
 TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::RequestProcessingPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -364,9 +356,6 @@ PortableServer::POA_ptr
 TAO_Root_POA::create_POA_i (const char *adapter_name,
                             PortableServer::POAManager_ptr poa_manager,
                             const CORBA::PolicyList &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   // Initialize a TAO_POA_Policy_Set instance so that it contains the
   // default POA policies.
@@ -474,9 +463,6 @@ PortableServer::POA_ptr
 TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
                             PortableServer::POAManager_ptr poa_manager,
                             const TAO_POA_Policy_Set &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   // This operaton creates a new POA as a child of the target POA. The
   // specified name identifies the new POA with respect to other POAs
@@ -556,8 +542,6 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
 PortableServer::POA_ptr
 TAO_Root_POA::find_POA (const char *adapter_name,
                         CORBA::Boolean activate_it)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -572,8 +556,6 @@ TAO_Root_POA::find_POA (const char *adapter_name,
 TAO_Root_POA *
 TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
                           CORBA::Boolean activate_it)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
 {
   TAO_Root_POA *child = 0;
   int result = this->children_.find (child_name,
@@ -659,9 +641,6 @@ PortableServer::POA_ptr
 TAO_Root_POA::create_POA (const char *adapter_name,
                           PortableServer::POAManager_ptr poa_manager,
                           const CORBA::PolicyList &policies)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -674,9 +653,6 @@ TAO_Root_POA::create_POA (const char *adapter_name,
 
 PortableServer::ObjectId *
 TAO_Root_POA::servant_to_id (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // If we had upgradeable locks, this would initially be a read lock
   //
@@ -688,9 +664,6 @@ TAO_Root_POA::servant_to_id (PortableServer::Servant servant)
 
 PortableServer::ObjectId *
 TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     servant_to_user_id (servant);
@@ -698,10 +671,6 @@ TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant)
 
 PortableServer::Servant
 TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -711,9 +680,6 @@ TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference)
 
 CORBA::Object_ptr
 TAO_Root_POA::servant_to_reference (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
 
@@ -722,7 +688,6 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant)
 
 PortableServer::POAList *
 TAO_Root_POA::the_children (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -733,9 +698,6 @@ TAO_Root_POA::the_children (void)
 
 PortableServer::Servant
 TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -745,9 +707,6 @@ TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid)
 
 CORBA::Object_ptr
 TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -759,7 +718,6 @@ TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid)
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
                                         const char *intf)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
@@ -773,7 +731,6 @@ TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
 void
 TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects,
                        CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO::Portable_Server::POA_Guard poa_guard (*this , 0);
@@ -792,7 +749,6 @@ TAO_Root_POA::remove_from_parent_i (void)
 void
 TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
                          CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->cleanup_in_progress_)
     return;
@@ -969,7 +925,6 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child)
 
 PortableServer::POAList *
 TAO_Root_POA::the_children_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList_var children;
   CORBA::ULong child_current = static_cast <CORBA::ULong>
@@ -994,7 +949,6 @@ TAO_Root_POA::the_children_i (void)
 
 PortableInterceptor::AdapterName *
 TAO_Root_POA::adapter_name_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The adapter name is the sequence of names starting from the
   // RootPOA to the one whose name is requested.  The name of the
@@ -1052,7 +1006,6 @@ TAO_Root_POA::adapter_name_i (void)
 void
 TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile,
                                  const IOP::TaggedComponent &component)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles.
   const CORBA::ULong profile_count = mprofile.profile_count ();
@@ -1070,7 +1023,6 @@ TAO_Root_POA::add_ior_component_to_profile (
     TAO_MProfile & mprofile,
     const IOP::TaggedComponent &component,
     IOP::ProfileId profile_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles matching the given
   // ProfileId.
@@ -1101,7 +1053,6 @@ void
 TAO_Root_POA::adapter_state_changed (
    const TAO::ORT_Array &array_obj_ref_template,
    PortableInterceptor::AdapterState state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IORInterceptor_Adapter *ior_adapter =
     this->orb_core_.ior_interceptor_adapter ();
@@ -1116,9 +1067,6 @@ PortableServer::ObjectId *
 TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
                                  CORBA::Short priority,
                                  bool &wait_occurred_restart_call)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     activate_object (servant,
@@ -1128,9 +1076,6 @@ TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
 
 PortableServer::ObjectId *
 TAO_Root_POA::activate_object (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   while (1)
     {
@@ -1158,10 +1103,6 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant)
 void
 TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                                        PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   while (1)
     {
@@ -1192,10 +1133,6 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant servant,
                                          CORBA::Short priority,
                                          bool &wait_occurred_restart_call)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.servant_retention_strategy()->
     activate_object_with_id (id,
@@ -1208,8 +1145,6 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
 void
 TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
                                         CORBA::Boolean wait_for_completion)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   this->deactivate_all_objects_i (etherealize_objects);
 
@@ -1272,8 +1207,6 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core
 
 void
 TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.request_processing_strategy ()->
     etherealize_objects (etherealize_objects);
@@ -1284,9 +1217,6 @@ TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects)
 
 void
 TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -1297,9 +1227,6 @@ TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid)
 
 void
 TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.servant_retention_strategy()->
     deactivate_object (id);
@@ -1313,8 +1240,6 @@ TAO_Root_POA::is_persistent (void) const
 
 CORBA::Object_ptr
 TAO_Root_POA::create_reference (const char *intf)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
@@ -1326,8 +1251,6 @@ TAO_Root_POA::create_reference (const char *intf)
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_i (const char *intf,
                                   CORBA::Short priority)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   if (!this->has_system_id ())
     {
@@ -1341,7 +1264,6 @@ TAO_Root_POA::create_reference_i (const char *intf,
 CORBA::Object_ptr
 TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id,
                                              const PortableServer::ObjectId & id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const PortableInterceptor::ObjectId &user_oid =
     reinterpret_cast <const PortableInterceptor::ObjectId &>(id);
@@ -1363,7 +1285,6 @@ CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
                                           const char *intf,
                                           CORBA::Short priority)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the POA has the SYSTEM_ID policy and it detects that the
   // Object Id value was not generated by the system or for this POA,
@@ -1386,9 +1307,6 @@ TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_i
 
 PortableServer::ObjectId *
 TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.request_processing_strategy()->
     servant_to_id (servant);
@@ -1396,9 +1314,6 @@ TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant)
 
 CORBA::Object_ptr
 TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     servant_to_reference (servant);
@@ -1406,10 +1321,6 @@ TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant)
 
 PortableServer::Servant
 TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   // Make sure that the reference is valid.
   if (CORBA::is_nil (reference))
@@ -1490,9 +1401,6 @@ TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference,
 PortableServer::ObjectId *
 TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
 {
   // Make sure that the reference is valid.
   if (CORBA::is_nil (reference))
@@ -1551,9 +1459,6 @@ TAO_Root_POA::cleanup_servant (
 PortableServer::Servant
 TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
                                )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
 
   PortableServer::Servant servant =
@@ -1582,9 +1487,6 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
 PortableServer::Servant
 TAO_Root_POA::user_id_to_servant_i (const PortableServer::ObjectId &id
                                     )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     user_id_to_servant (id);
@@ -1594,9 +1496,6 @@ CORBA::Object_ptr
 TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id,
                                  bool indirect
                                  )
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
     id_to_reference (id, indirect);
@@ -1604,7 +1503,6 @@ TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id,
 
 CORBA::OctetSeq *
 TAO_Root_POA::id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::OctetSeq *id = 0;
   ACE_NEW_THROW_EX (id,
@@ -2407,7 +2305,6 @@ TAO_Root_POA::ORT_adapter_i (void)
 
 PortableServer::AdapterActivator_ptr
 TAO_Root_POA::the_activator (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ());
@@ -2418,7 +2315,6 @@ TAO_Root_POA::the_activator (void)
 void
 TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
                              )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -2432,8 +2328,6 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa
 
 PortableServer::ServantManager_ptr
 TAO_Root_POA::get_servant_manager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
@@ -2444,8 +2338,6 @@ TAO_Root_POA::get_servant_manager (void)
 
 void
 TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -2456,8 +2348,6 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
 
 PortableServer::Servant
 TAO_Root_POA::get_servant_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.request_processing_strategy()->
     get_servant ();
@@ -2465,9 +2355,6 @@ TAO_Root_POA::get_servant_i (void)
 
 PortableServer::Servant
 TAO_Root_POA::get_servant (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::NoServant,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -2501,8 +2388,6 @@ TAO_Root_POA::get_servant (void)
 
 void
 TAO_Root_POA::set_servant (PortableServer::Servant servant)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
@@ -2626,7 +2511,6 @@ TAO_Root_POA::root (void) const
 
 TAO::ORT_Adapter *
 TAO_Root_POA::ORT_adapter (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->ort_adapter_ != 0)
     return this->ort_adapter_;
@@ -2711,7 +2595,6 @@ TAO_Root_POA::imr_client_adapter_name (void)
 
 PortableServer::POAManager_ptr
 TAO_Root_POA::the_POAManager (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManager::_duplicate (&this->poa_manager_);
 }
@@ -2719,7 +2602,6 @@ TAO_Root_POA::the_POAManager (void)
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 PortableServer::POAManagerFactory_ptr
 TAO_Root_POA::the_POAManagerFactory (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_);
 }