ChangeLogTag:Thu Mar 13 17:12:21 2003 Ossama Othman <ossama@uci.edu>

4 files changed, 104 insertions, 89 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2afdbb73c0f..43fdd7b6e21 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Thu Mar 13 17:12:21 2003  Ossama Othman  <ossama@uci.edu>
+
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h (TAO_SSLIOP_Profile):
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp (TAO_SSLIOP_Profile):
+
+	  Corrected ObjectKey parameter in these constructors.  The
+	  "TAO_ObjectKey" type has been replaced by the "TAO::ObjectKey"
+	  type.
+
+	  (parse_string):
+
+	  Added missing ACE_CHECK.  Fixes potentially missed run-time
+	  errors in emulated exception builds.
+
 Thu Mar 13 14:13:08 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
index bddc5e8a329..3898e1583b6 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
+++ b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP
@@ -273,8 +273,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -673,8 +673,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1048,8 +1048,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1406,8 +1406,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1815,8 +1815,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2021,8 +2021,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2227,8 +2227,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2431,8 +2431,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2654,8 +2654,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2941,8 +2941,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -3234,8 +3234,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -3437,8 +3437,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -3734,8 +3734,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -4164,8 +4164,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -4391,8 +4391,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -4895,8 +4895,8 @@ realclean: clean
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -5251,8 +5251,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -5785,8 +5785,8 @@ realclean: clean
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -6046,8 +6046,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -6602,8 +6602,8 @@ realclean: clean
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -6989,8 +6989,8 @@ realclean: clean
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -7234,8 +7234,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -7435,8 +7435,8 @@ realclean: clean
   $(TAO_ROOT)/tao/WrongTransactionC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index 98a44562120..541caaae945 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -1,25 +1,24 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// $Id$
-
 #include "SSLIOP_Profile.h"
 #include "ssl_endpoints.h"
 #include "tao/CDR.h"
 #include "tao/Environment.h"
 
+
 ACE_RCSID (TAO_SSLIOP,
            SSLIOP_Profile,
            "$Id$")
 
+
 #if !defined (__ACE_INLINE__)
 # include "SSLIOP_Profile.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr &addr,
-                                        const TAO_ObjectKey &object_key,
-                                        const TAO_GIOP_Message_Version &version,
-                                        TAO_ORB_Core *orb_core,
-                                        const SSLIOP::SSL *ssl_component)
+TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (
+  const ACE_INET_Addr & addr,
+  const TAO::ObjectKey & object_key,
+  const TAO_GIOP_Message_Version & version,
+  TAO_ORB_Core * orb_core,
+  const SSLIOP::SSL * ssl_component)
   : TAO_IIOP_Profile (addr,
                       object_key,
                       version,
@@ -29,13 +28,14 @@ TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const ACE_INET_Addr &addr,
   this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, 1);
 }
 
-TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const char* host,
-                                        CORBA::UShort port,
-                                        const TAO_ObjectKey &object_key,
-                                        const ACE_INET_Addr &addr,
-                                        const TAO_GIOP_Message_Version &version,
-                                        TAO_ORB_Core *orb_core,
-                                        const SSLIOP::SSL *ssl_component)
+TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (
+  const char * host,
+  CORBA::UShort port,
+  const TAO::ObjectKey & object_key,
+  const ACE_INET_Addr & addr,
+  const TAO_GIOP_Message_Version & version,
+  TAO_ORB_Core * orb_core,
+  const SSLIOP::SSL * ssl_component)
   : TAO_IIOP_Profile (host,
                       port,
                       object_key,
@@ -47,15 +47,15 @@ TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (const char* host,
   this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, 1);
 }
 
-TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core *orb_core,
-                                        const SSLIOP::SSL *ssl_component)
+TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core,
+                                        const SSLIOP::SSL * ssl_component)
   : TAO_IIOP_Profile (orb_core),
     ssl_endpoint_ (ssl_component, 0)
 {
   this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, 1);
 }
 
-TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core *orb_core)
+TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core)
   : TAO_IIOP_Profile (orb_core),
     ssl_endpoint_ (0, 0)
 {
@@ -82,7 +82,7 @@ TAO_SSLIOP_Profile::~TAO_SSLIOP_Profile (void)
 //  0 -> can't understand this version
 //  1 -> success.
 int
-TAO_SSLIOP_Profile::decode (TAO_InputCDR& cdr)
+TAO_SSLIOP_Profile::decode (TAO_InputCDR & cdr)
 {
   int r = this->TAO_IIOP_Profile::decode (cdr);
   if (r != 1)
@@ -170,7 +170,7 @@ TAO_SSLIOP_Profile::decode (TAO_InputCDR& cdr)
 }
 
 CORBA::Boolean
-TAO_SSLIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
+TAO_SSLIOP_Profile::is_equivalent (const TAO_Profile * other_profile)
 {
   const TAO_SSLIOP_Profile *op =
     ACE_dynamic_cast (const TAO_SSLIOP_Profile *, other_profile);
@@ -198,7 +198,7 @@ TAO_SSLIOP_Profile::endpoint (void)
 }
 
 void
-TAO_SSLIOP_Profile::add_endpoint (TAO_SSLIOP_Endpoint *endp)
+TAO_SSLIOP_Profile::add_endpoint (TAO_SSLIOP_Endpoint * endp)
 {
   endp->next_ = this->ssl_endpoint_.next_;
   this->ssl_endpoint_.next_ = endp;
@@ -240,7 +240,8 @@ TAO_SSLIOP_Profile::encode_endpoints (void)
            == 0)
           || (out_cdr << endpoints) == 0)
         return -1;
-      CORBA::ULong length = out_cdr.total_length ();
+
+      const CORBA::ULong length = out_cdr.total_length ();
 
       IOP::TaggedComponent tagged_component;
       tagged_component.tag = TAO_TAG_SSL_ENDPOINTS;
@@ -310,8 +311,7 @@ TAO_SSLIOP_Profile::decode_endpoints (void)
       // Now that we have a complete list of ssl endpoins, we can
       // connect them with their iiop counterparts, which have been
       // extracted/chained during the IIOP profile decoding.
-      TAO_IIOP_Endpoint *iiop_endp =
-        &this->endpoint_;
+      TAO_IIOP_Endpoint *iiop_endp = &this->endpoint_;
 
       for (TAO_SSLIOP_Endpoint * ssl_endp = &this->ssl_endpoint_;
            ssl_endp != 0;
@@ -331,11 +331,12 @@ TAO_SSLIOP_Profile::decode_endpoints (void)
 }
 
 void
-TAO_SSLIOP_Profile::parse_string (const char *ior
+TAO_SSLIOP_Profile::parse_string (const char * ior
                                   ACE_ENV_ARG_DECL)
 {
    TAO_IIOP_Profile::parse_string (ior
                                    ACE_ENV_ARG_PARAMETER);
+   ACE_CHECK;
 
-    this->ssl_endpoint_.iiop_endpoint(&this->endpoint_, 1);
+   this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, 1);
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
index 0172f3a0d96..d0d71834ba6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -45,28 +45,28 @@ class TAO_SSLIOP_Export TAO_SSLIOP_Profile : public TAO_IIOP_Profile
 public:
   /// Profile constructor, same as above except the object_key has
   /// already been marshaled.
-  TAO_SSLIOP_Profile (const ACE_INET_Addr &addr,
-                      const TAO_ObjectKey &object_key,
-                      const TAO_GIOP_Message_Version &version,
-                      TAO_ORB_Core *orb_core,
-                      const SSLIOP::SSL *ssl_component);
+  TAO_SSLIOP_Profile (const ACE_INET_Addr & addr,
+                      const TAO::ObjectKey & object_key,
+                      const TAO_GIOP_Message_Version & version,
+                      TAO_ORB_Core * orb_core,
+                      const SSLIOP::SSL * ssl_component);
 
   ///  Profile constructor, this is the most efficient since it
   /// doesn't require any address resolution processing.
   TAO_SSLIOP_Profile (const char *host,
                       CORBA::UShort port,
-                      const TAO_ObjectKey &object_key,
-                      const ACE_INET_Addr &addr,
-                      const TAO_GIOP_Message_Version &version,
-                      TAO_ORB_Core *orb_core,
-                      const SSLIOP::SSL *ssl_component);
+                      const TAO::ObjectKey & object_key,
+                      const ACE_INET_Addr & addr,
+                      const TAO_GIOP_Message_Version & version,
+                      TAO_ORB_Core * orb_core,
+                      const SSLIOP::SSL * ssl_component);
 
   /// Create profile with the given SSLIOP tagged component.
-  TAO_SSLIOP_Profile (TAO_ORB_Core *orb_core,
-                      const SSLIOP::SSL *ssl_component);
+  TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core,
+                      const SSLIOP::SSL * ssl_component);
 
   /// Profile constructor, default.
-  TAO_SSLIOP_Profile (TAO_ORB_Core *orb_core);
+  TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core);
 
   /// Destructor is to be called only through _decr_refcnt().
   ~TAO_SSLIOP_Profile (void);
@@ -86,7 +86,7 @@ public:
   virtual int decode (TAO_InputCDR& cdr);
   virtual int encode_endpoints (void);
 
-  virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
+  virtual CORBA::Boolean is_equivalent (const TAO_Profile * other_profile);
 
   /// Return pointer to the head of this profile's endpoints list,
   /// i.e., <ssl_endpoint_> accessor.
@@ -100,7 +100,7 @@ public:
    * Initialize this object using the given input string.
    * Url-style string contain only one endpoint.
    */
-  virtual void parse_string (const char *string
+  virtual void parse_string (const char * string
                              ACE_ENV_ARG_DECL);
 
   /**
@@ -109,7 +109,7 @@ public:
    * <endp>.  If <endp>'s <iiop_endpoint_> member is not 0, it is
    * added to our parent's class endpoint list.
    */
-  void add_endpoint (TAO_SSLIOP_Endpoint *endp);
+  void add_endpoint (TAO_SSLIOP_Endpoint * endp);
 
 private: