1 files changed, 6 insertions, 18 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index 3e866342315..8f80d4dfd5f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -91,7 +91,6 @@ TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer (void)
 
 char *
 TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -100,7 +99,6 @@ TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void)
 
 SecurityLevel3::AcquisitionStatus
 TAO::SSLIOP::CredentialsAcquirer::current_status (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -109,7 +107,6 @@ TAO::SSLIOP::CredentialsAcquirer::current_status (void)
 
 CORBA::ULong
 TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
@@ -120,45 +117,38 @@ TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void)
 
 CORBA::Any *
 TAO::SSLIOP::CredentialsAcquirer::get_continuation_data ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // SSL/TLS credentials acquisition does generate continuation data.
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
+  throw CORBA::BAD_INV_ORDER ();
 }
 
 SecurityLevel3::AcquisitionStatus
 TAO::SSLIOP::CredentialsAcquirer::continue_acquisition (
     const CORBA::Any & /* acquisition_arguments */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // SSL/TLS credentials acquisition does generate continuation data.
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
-                    SecurityLevel3::AQST_Failed);
+  throw CORBA::BAD_INV_ORDER ();
 }
 
 SecurityLevel3::OwnCredentials_ptr
 TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();
 
   ::SSLIOP::AuthData *data;
 
   if (!(this->acquisition_arguments_ >>= data))
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      SecurityLevel3::OwnCredentials::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   TAO::SSLIOP::X509_var x509 = this->make_X509 (data->certificate);
 
   if (x509.in () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      SecurityLevel3::OwnCredentials::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   TAO::SSLIOP::EVP_PKEY_var evp = this->make_EVP_PKEY (data->key);
 
   if (evp.in () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                      SecurityLevel3::OwnCredentials::_nil ());
+    throw CORBA::BAD_PARAM ();
 
   // Verify that the private key is consistent with the certificate.
   if (::X509_check_private_key (x509.in (), evp.in ()) != 1)
@@ -168,8 +158,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
                     ACE_TEXT ("(%P|%t) ERROR: Private key is not ")
                     ACE_TEXT ("consistent with X.509 certificate")));
 
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        SecurityLevel3::OwnCredentials::_nil ());
+      throw CORBA::BAD_PARAM ();
     }
 
   TAO::SSLIOP::OwnCredentials * creds;
@@ -191,7 +180,6 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
 
 void
 TAO::SSLIOP::CredentialsAcquirer::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity ();