Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

16 files changed, 37 insertions, 77 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index 20216f4a905..244b3dd3e6e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -31,7 +31,7 @@ TAO::Security::EstablishTrustPolicy::policy_type (
 }
 
 CORBA::Policy_ptr
-TAO::Security::EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::Security::EstablishTrustPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::EstablishTrustPolicy *policy = 0;
@@ -42,19 +42,18 @@ TAO::Security::EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return policy;
 }
 
 void
-TAO::Security::EstablishTrustPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::EstablishTrustPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 ::Security::EstablishTrust
-TAO::Security::EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::EstablishTrustPolicy::trust (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->trust_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index b7910c316d9..fc9fa6fd086 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -64,19 +64,19 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
       /// Return the "establish trust" value associated with this
       /// policy.
-      virtual ::Security::EstablishTrust trust (ACE_ENV_SINGLE_ARG_DECL)
+      virtual ::Security::EstablishTrust trust (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index 9175ac608b0..cf08adc0434 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -22,14 +22,14 @@ TAO::Security::QOPPolicy::~QOPPolicy (void)
 }
 
 CORBA::PolicyType
-TAO::Security::QOPPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::QOPPolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Security::SecQOPPolicy;
 }
 
 CORBA::Policy_ptr
-TAO::Security::QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::Security::QOPPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::QOPPolicy * policy = 0;
@@ -40,19 +40,18 @@ TAO::Security::QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return policy;
 }
 
 void
-TAO::Security::QOPPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::QOPPolicy::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::QOP
-TAO::Security::QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::QOPPolicy::qop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->qop_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index ff8b99e2309..2eb71919ffb 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -61,19 +61,19 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
       /// Return the Quality-of-Protection value associated with this
       /// policy.
-      virtual ::Security::QOP qop (ACE_ENV_SINGLE_ARG_DECL)
+      virtual ::Security::QOP qop (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index 22b8d7ad961..ce1f7d6f1f9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -38,7 +38,7 @@ TAO::SL3::ContextEstablishmentPolicy::creds_directive (
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ContextEstablishmentPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ContextEstablishmentPolicy::creds_list (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
@@ -46,7 +46,6 @@ TAO::SL3::ContextEstablishmentPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (creds,
                     SecurityLevel3::OwnCredentialsList (this->creds_list_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (creds);
 
   return creds;
 }
@@ -92,7 +91,7 @@ TAO::SL3::ContextEstablishmentPolicy::policy_type (
 }
 
 CORBA::Policy_ptr
-TAO::SL3::ContextEstablishmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ContextEstablishmentPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Policy_ptr p = CORBA::Policy::_nil ();
@@ -105,7 +104,6 @@ TAO::SL3::ContextEstablishmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                       this->use_confidentiality_,
                       this->use_integrity_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (p);
 
   return p;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index 266c1dd31f6..dfb5b5a2516 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -89,13 +89,13 @@ namespace TAO
           ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 6555f46469c..d9b4e0db1b2 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -76,7 +76,7 @@ TAO::SL3::CredentialsCurator::_nil (void)
 }
 
 SecurityLevel3::AcquisitionMethodList *
-TAO::SL3::CredentialsCurator::supported_methods (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::CredentialsCurator::supported_methods (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::AcquisitionMethodList * list;
@@ -128,14 +128,13 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::CredentialsCurator::default_creds_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::CredentialsCurator::default_creds_list (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentialsList * list;
   ACE_NEW_THROW_EX (list,
                     SecurityLevel3::OwnCredentialsList,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   SecurityLevel3::OwnCredentialsList_var creds_list = list;
 
@@ -161,7 +160,7 @@ TAO::SL3::CredentialsCurator::default_creds_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 SecurityLevel3::CredentialsIdList *
-TAO::SL3::CredentialsCurator::default_creds_ids (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::CredentialsCurator::default_creds_ids (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::CredentialsIdList * list;
@@ -265,8 +264,7 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials (
   ACE_ENV_ARG_DECL)
 {
   CORBA::String_var credentials_id =
-    credentials->creds_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    credentials->creds_id ();
 
   SecurityLevel3::OwnCredentials_var creds =
     SecurityLevel3::OwnCredentials::_duplicate (credentials);
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index 69cac1d1ae1..3088ce32014 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -21,7 +21,7 @@ TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy (void)
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ObjectCredentialsPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ObjectCredentialsPolicy::creds_list (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
@@ -29,7 +29,6 @@ TAO::SL3::ObjectCredentialsPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (creds,
                     SecurityLevel3::OwnCredentialsList (this->creds_list_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (creds);
 
   return creds;
 }
@@ -43,20 +42,19 @@ TAO::SL3::ObjectCredentialsPolicy::policy_type (
 }
 
 CORBA::Policy_ptr
-TAO::SL3::ObjectCredentialsPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ObjectCredentialsPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Policy_ptr p = CORBA::Policy::_nil ();
   ACE_NEW_THROW_EX (p,
                     TAO::SL3::ObjectCredentialsPolicy (this->creds_list_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (p);
 
   return p;
 }
 
 void
-TAO::SL3::ObjectCredentialsPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ObjectCredentialsPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->creds_list_.length (0);
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index c4479d9aa8e..37a3dfd6ecb 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -69,13 +69,13 @@ namespace TAO
           ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index 959a93e4885..8fc5eec666e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -37,7 +37,6 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
                           arg->use_confidentiality,
                           arg->use_integrity),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (policy);
     }
   else if (type == SecurityLevel3::ObjectCredentialsPolicyType)
     {
@@ -49,7 +48,6 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
       ACE_NEW_THROW_EX (policy,
                         TAO::SL3::ObjectCredentialsPolicy (*creds),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (policy);
     }
   else
     {
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index db6609f803b..04ada737774 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -27,7 +27,7 @@ TAO::SL3::SecurityCurrent::~SecurityCurrent (void)
 }
 
 SecurityLevel3::ClientCredentials_ptr
-TAO::SL3::SecurityCurrent::client_credentials (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::SecurityCurrent::client_credentials (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
@@ -39,11 +39,11 @@ TAO::SL3::SecurityCurrent::client_credentials (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
                       SecurityLevel3::ClientCredentials::_nil ());
 
-  return impl->client_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->client_credentials ();
 }
 
 CORBA::Boolean
-TAO::SL3::SecurityCurrent::request_is_local (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::SecurityCurrent::request_is_local (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
@@ -54,7 +54,7 @@ TAO::SL3::SecurityCurrent::request_is_local (ACE_ENV_SINGLE_ARG_DECL)
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), false);
 
-  return impl->request_is_local (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->request_is_local ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index b592530c19e..b995b51cd25 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -73,7 +73,7 @@ namespace TAO
           ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean request_is_local (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean request_is_local (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index 1cf548a4f2e..d675bbb17c3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -61,7 +61,6 @@ TAO::SL3::SecurityManager::create_context_estab_policy (
                                                           use_confidentiality,
                                                           use_integrity),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (policy);
 
   return policy;
 }
@@ -76,7 +75,6 @@ TAO::SL3::SecurityManager::create_object_creds_policy (
   ACE_NEW_THROW_EX (policy,
                     TAO::SL3::ObjectCredentialsPolicy (creds_list),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (policy);
 
   return policy;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 0470c54ab17..7e0edc5be59 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -55,7 +55,7 @@ TAO_Security_Current::received_credentials (
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->received_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->received_credentials ();
 }
 
 int
@@ -72,7 +72,6 @@ TAO_Security_Current::init (void)
                                             argv,
                                             this->orb_id_.in ()
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       this->orb_core_ = orb.in ()->orb_core ();
 
@@ -89,7 +88,6 @@ TAO_Security_Current::init (void)
       result = -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return result;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index 396f2116aa0..f735c30dcbf 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -31,7 +31,6 @@ TAO::Security::ORBInitializer::pre_init (
   TAO_ORBInitInfo_var tao_info =
     TAO_ORBInitInfo::_narrow (info
                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   if (CORBA::is_nil (tao_info.in ()))
     {
@@ -49,10 +48,8 @@ TAO::Security::ORBInitializer::pre_init (
 //   // thread-specific portion of Security::Current.
 //   size_t old_tss_slot = tao_info->allocate_tss_slot_id (0
 //                                                         ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK;
 
-//   CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-//   ACE_CHECK;
+//   CORBA::String_var orb_id = info->orb_id ();
 
 //   // Create the SecurityLevel2::Current object.
 //   SecurityLevel2::Current_ptr current = SecurityLevel2::Current::_nil ();
@@ -63,7 +60,6 @@ TAO::Security::ORBInitializer::pre_init (
 //                         TAO::VMCID,
 //                         ENOMEM),
 //                       CORBA::COMPLETED_NO));
-//   ACE_CHECK;
 
 //   SecurityLevel2::Current_var security_current = current;
 
@@ -72,14 +68,12 @@ TAO::Security::ORBInitializer::pre_init (
 //   info->register_initial_reference ("SecurityCurrent",
 //                                     security_current.in ()
 //                                     ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK;
 
   // Reserve a TSS slot in the ORB core internal TSS resources for the
   // thread-specific portion of SecurityLevel3::SecurityCurrent
   // object.
   size_t tss_slot = tao_info->allocate_tss_slot_id (0
                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
 
   // Create the SecurityLevel3::Current object.
@@ -92,7 +86,6 @@ TAO::Security::ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   SecurityLevel3::SecurityCurrent_var security_current3 = current3;
 
@@ -101,7 +94,6 @@ TAO::Security::ORBInitializer::pre_init (
   info->register_initial_reference ("SecurityLevel3:SecurityCurrent",
                                     security_current3.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   // Create the SecurityLevel3::CredentialsCurator object.
   SecurityLevel3::CredentialsCurator_ptr curator;
@@ -112,7 +104,6 @@ TAO::Security::ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   SecurityLevel3::CredentialsCurator_var credentials_curator = curator;
 
@@ -121,7 +112,6 @@ TAO::Security::ORBInitializer::pre_init (
   info->register_initial_reference ("SecurityLevel3:CredentialsCurator",
                                     credentials_curator.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   // Create the SecurityLevel3::SecurityManager object.
   SecurityLevel3::SecurityManager_ptr manager3;
@@ -132,7 +122,6 @@ TAO::Security::ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   SecurityLevel3::SecurityManager_var security_manager3 = manager3;
 
@@ -141,7 +130,6 @@ TAO::Security::ORBInitializer::pre_init (
   info->register_initial_reference ("SecurityLevel3:SecurityManager",
                                     security_manager3.in ()
                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -152,7 +140,6 @@ TAO::Security::ORBInitializer::post_init (
 {
   this->register_policy_factories (info
                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
@@ -172,7 +159,6 @@ TAO::Security::ORBInitializer::register_policy_factories (
                               TAO::VMCID,
                               ENOMEM),
                             CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       this->policy_factory_ = policy_factory;
     }
@@ -187,51 +173,43 @@ TAO::Security::ORBInitializer::register_policy_factories (
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   type = ::Security::SecMechanismsPolicy;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   type = ::Security::SecInvocationCredentialsPolicy;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   type = ::Security::SecFeaturePolicy;   // Deprecated
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   type = ::Security::SecDelegationDirectivePolicy;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
   type = ::Security::SecEstablishTrustPolicy;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
 
   type = SecurityLevel3::ContextEstablishmentPolicyType;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
 
   type = SecurityLevel3::ObjectCredentialsPolicyType;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 
 
   // ----------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 96f0ddbb787..624827950ef 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -53,7 +53,6 @@ TAO::Security::PolicyFactory::create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return qop_policy;
     }
@@ -80,7 +79,6 @@ TAO::Security::PolicyFactory::create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return trust_policy;
     }
@@ -113,7 +111,6 @@ TAO::Security::PolicyFactory::create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }
@@ -140,7 +137,6 @@ TAO::Security::PolicyFactory::create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }