ChangeLogTag:Sun Feb 14 12:41:55 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

12 files changed, 104 insertions, 86 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 9584457bd5d..be3ac815662 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,21 @@
+Sun Feb 14 12:41:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/Invocation.cpp: 
+	* tao/Pluggable.cpp: 
+	  We must always check the environment after passing it down to
+	  another function.
+
+	* tao/IIOP_Acceptor.cpp: 
+	* tao/IIOP_Connector.cpp: 
+	* tao/IIOP_ORB.cpp: 
+	* tao/IIOP_Profile.cpp: 
+	* tao/ORB.cpp: 
+	* tao/Object_KeyC.cpp: 
+	* tao/POAC.cpp: 
+	* tao/Typecode_Constants.cpp: 
+	* tao/orbconf.h: 
+	  Several cosmetic fixes, mostly trailing spaces removed.
+
 Sat Feb 13 17:52:01 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
 	Changed the following to make the time returned in units of 100
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index d87565ba588..9cc23fcacc3 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -34,7 +34,7 @@ TAO_IIOP_Acceptor::create_profile (TAO_ObjectKey &)
   return 0;
 }
 
-ACE_Event_Handler* 
+ACE_Event_Handler*
 TAO_IIOP_Acceptor::acceptor (void)
 {
   return &base_acceptor_;
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 844095f74f0..60d9c548616 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -37,8 +37,8 @@ TAO_IIOP_Connector::connect(TAO_Profile *profile, CORBA::Environment &env)
 {
   if (profile->tag () != TAO_IOP_TAG_INTERNET_IOP)
     TAO_THROW_ENV_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), env, 0);
-  
-  TAO_IIOP_Profile *iiop_profile = 
+
+  TAO_IIOP_Profile *iiop_profile =
     ACE_dynamic_cast(TAO_IIOP_Profile*,profile);
 
   if (iiop_profile == 0)
@@ -52,7 +52,7 @@ TAO_IIOP_Connector::connect(TAO_Profile *profile, CORBA::Environment &env)
 //     {
 //       ACE_INET_Addr local_addr (this->orb_core_->orb_params ()->addr ());
 //       local_addr.set_port_number (server_addr_p->get_port_number ());
-// 
+//
 //       // Set the local port number to use.
 //       if (con->connect (iiop_profile->hint (),
 //                         iiop_profile->object_addr (),
@@ -88,7 +88,7 @@ TAO_IIOP_Connector::connect(TAO_Profile *profile, CORBA::Environment &env)
                   "errno"));
 
     TAO_THROW_ENV_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_NO), env, 0);
-  } 
+  }
 
   // the connect call will set the hint () stored in the Profile
   // object.
diff --git a/TAO/tao/IIOP_ORB.cpp b/TAO/tao/IIOP_ORB.cpp
index 6f017603bdd..5afe478233f 100644
--- a/TAO/tao/IIOP_ORB.cpp
+++ b/TAO/tao/IIOP_ORB.cpp
@@ -104,7 +104,7 @@ IIOP_ORB::object_to_string (CORBA::Object_ptr obj,
         // @@ This should be some sort of default prefix, not
         // hardcoded to IIOP!! FRED
 
-      CORBA::String buf = 
+      CORBA::String buf =
         obj->_stubobj ()->profile_in_use ()->to_string (env);
       return buf;
     }
@@ -197,9 +197,9 @@ iiop_string_to_object (const char *string,
 
   // Now make the STUB_Object ...
   STUB_Object *data;
-  ACE_NEW_RETURN (data, 
+  ACE_NEW_RETURN (data,
                   STUB_Object ((char *) 0,
-                               pfile), 
+                               pfile),
                   CORBA::Object::_nil ());
   // pfile refcount == 2
 
@@ -296,7 +296,7 @@ IIOP_ORB::_get_collocated_servant (STUB_Object *sobj)
           return 0;
         }
 
-      // Check if the object requested is a collocated object. 
+      // Check if the object requested is a collocated object.
       // @@ FRED - can we make this more generic!!
       TAO_POA *poa = 0;
       if (pfile->tag () == TAO_IOP_TAG_INTERNET_IOP)
@@ -304,7 +304,7 @@ IIOP_ORB::_get_collocated_servant (STUB_Object *sobj)
           ACE_INET_Addr &addr =
             ACE_dynamic_cast (ACE_INET_Addr &,
                               pfile->object_addr());
-    
+
           poa = TAO_ORB_Core_instance ()->get_collocated_poa (addr);
         }
       else
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 40b16dcb777..08379aa8eb2 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -201,7 +201,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile *pfile)
     refcount_ (1),
     fwd_profiles_ (0)
 {
-  
+
   ACE_NEW (this->host_,
            char[ACE_OS::strlen (pfile->host_) + 1]);
   ACE_OS::strcpy (this->host_, pfile->host_);
@@ -222,7 +222,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile)
     refcount_ (1),
     fwd_profiles_ (0)
 {
-  
+
   ACE_NEW (this->host_,
            char[ACE_OS::strlen (pfile.host_) + 1]);
   ACE_OS::strcpy (this->host_, pfile.host_);
@@ -318,7 +318,7 @@ TAO_IIOP_Profile:: ~TAO_IIOP_Profile ()
   {
     delete fwd_profiles_;
   }
-  
+
 }
 
 CORBA::ULong
@@ -337,13 +337,13 @@ TAO_IIOP_Profile::transport (void)
   return 0;
 }
 
-const TAO_ObjectKey & 
+const TAO_ObjectKey &
 TAO_IIOP_Profile::object_key (void) const
 {
   return this->object_key_;
 }
 
-TAO_ObjectKey & 
+TAO_ObjectKey &
 TAO_IIOP_Profile::object_key (TAO_ObjectKey& objkey)
 {
   this->object_key_ = objkey;
@@ -351,7 +351,7 @@ TAO_IIOP_Profile::object_key (TAO_ObjectKey& objkey)
 }
 
 TAO_ObjectKey *
-TAO_IIOP_Profile::_key (CORBA::Environment &env)
+TAO_IIOP_Profile::_key (CORBA::Environment &)
 {
   return new TAO_ObjectKey (this->object_key_);
 }
@@ -360,13 +360,13 @@ TAO_IIOP_Profile::_key (CORBA::Environment &env)
 // -1 -> error
 //  0 -> can't understand this version
 //  1 -> success.
-int 
-TAO_IIOP_Profile::parse (TAO_InputCDR& cdr, 
+int
+TAO_IIOP_Profile::parse (TAO_InputCDR& cdr,
                          CORBA::Boolean &continue_decoding,
                          CORBA::Environment &env)
 {
   CORBA::ULong encap_len = cdr.length ();
-  
+
   // Read and verify major, minor versions, ignoring IIOP
   // profiles whose versions we don't understand.
   //
@@ -387,7 +387,7 @@ TAO_IIOP_Profile::parse (TAO_InputCDR& cdr,
     delete [] this->host_;
     this->host_ = 0;
   }
-   
+
   // Get host and port
   if (cdr.decode (CORBA::_tc_string,
                   &this->host_,
@@ -423,8 +423,8 @@ TAO_IIOP_Profile::parse (TAO_InputCDR& cdr,
   }
   return 1;
 }
-  
-int 
+
+int
 TAO_IIOP_Profile::parse_string (const char *string,
                                 CORBA::Environment &env)
 {
@@ -434,7 +434,7 @@ TAO_IIOP_Profile::parse_string (const char *string,
 
   // Remove the "N.N//" prefix, and verify the version's one
   // that we accept
-  
+
   if (isdigit (string [0])
       && isdigit (string [2])
       && string [1] == '.'
@@ -480,7 +480,7 @@ TAO_IIOP_Profile::parse_string (const char *string,
   if (this->host_)
   {
     // @@ You are setting this->host_ using CORBA::string_alloc() a
-    // couple of lines below, you should then use CORBA::string_free() 
+    // couple of lines below, you should then use CORBA::string_free()
     // to release it!  In general use a single form of memory
     // allocation for a field/variable to avoid new/free() and
     // malloc/delete() mismatches.
@@ -520,7 +520,7 @@ TAO_IIOP_Profile::parse_string (const char *string,
 
 //  TAO_InputCDR cdr (body.get_buffer (), body.length (), body[0]);
 //
-// @@ 
+// @@
 //  CORBA::Boolean byte_order;
 //  cdr >> CORBA::Any::to_boolean (byte_order);
 //  cdr >> this->version_.major;
@@ -531,13 +531,13 @@ TAO_IIOP_Profile::parse_string (const char *string,
 //  this->object_addr_.set(this->port_, this->host_);
 // }
 
-const TAO_opaque& 
+const TAO_opaque&
 TAO_IIOP_Profile::body (void) const
 {
   return this->body_;
 }
 
-void 
+void
 TAO_IIOP_Profile::create_body (void)
 {
   TAO_OutputCDR cdr;
@@ -549,7 +549,7 @@ TAO_IIOP_Profile::create_body (void)
 //   cdr << this->host_;
 //   cdr << this->port_;
 //   cdr << this->object_key_;
-// 
+//
 //   // Create a copy by making a temporary TAO_opaque object.
 //   // @@ TODO the CDR stream may contain several fragments, need to
 //   // merge them...
@@ -559,7 +559,7 @@ TAO_IIOP_Profile::create_body (void)
 //                             0);            // not own
 // }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_IIOP_Profile::is_equivalent (TAO_Profile *other_profile,
                                  CORBA::Environment &env)
 {
@@ -584,9 +584,9 @@ TAO_IIOP_Profile::hash (CORBA::ULong max,
                         CORBA::Environment &env)
 {
   CORBA::ULong hashval;
-  
+
   env.clear ();
-  
+
   // Just grab a bunch of convenient bytes and hash them; could do
   // more (hostname, full key, exponential hashing) but no real need
   // to do so except if performance requires a more costly hash.
@@ -645,7 +645,7 @@ TAO_IIOP_Profile::host (const char *h)
     delete [] this->host_;
     this->host_ = 0;
   }
-  
+
   if (h)
   {
     ACE_NEW_RETURN (this->host_,
@@ -720,7 +720,7 @@ TAO_IIOP_Profile::operator= (const TAO_IIOP_Profile &src)
     delete [] this->host_;
     this->host_ = 0;
   }
-  
+
   if (src.host_)
   {
     ACE_NEW_RETURN (this->host_,
@@ -763,7 +763,7 @@ TAO_IIOP_Profile::_decr_refcnt (void)
 }
 
 
-void 
+void
 TAO_IIOP_Profile::fwd_profiles (TAO_MProfile *mprofiles)
 {
   // we assume ownership of the profile list!!
@@ -825,7 +825,7 @@ TAO_IIOP_Profile::prefix ()
   return ::prefix_;
 }
 
-CORBA::TypeCode::traverse_status 
+CORBA::TypeCode::traverse_status
 TAO_IIOP_Profile::encode (TAO_OutputCDR *&stream,
                           CORBA::Environment &env)
 {
@@ -886,4 +886,3 @@ TAO_IIOP_Profile::encode (TAO_OutputCDR *&stream,
 
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
-
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 10ed49fb267..c6126b42e31 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -126,15 +126,16 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
   if (this->data_ == 0)
     TAO_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
 
-  // Get a pointer to the connector registry, which might be in 
+  // Get a pointer to the connector registry, which might be in
   // thread-specific storage, depending on the concurrency model.
   TAO_Connector_Registry *conn_reg = this->orb_core_->connector_registry ();
 
-  // The connection registry is also responsible for selecting the 
+  // The connection registry is also responsible for selecting the
   // profile to use based on some policy or the current forwarding state.
-  // We will use the returned profile 
+  // We will use the returned profile
   // Note: data_->profile_in_use () == profile
   TAO_Profile *profile = conn_reg->connect (this->data_, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   const TAO_ObjectKey *key = &profile->object_key();
 
@@ -332,9 +333,9 @@ TAO_GIOP_Invocation::close_connection (void)
   this->data_->profile_in_use ()->transport ()->close_conn ();
   this->data_->profile_in_use ()->reset_hint ();
 
-  // @@ Get rid of any forwarding profiles and reset 
+  // @@ Get rid of any forwarding profiles and reset
   // the profile list to point to the first profile! FRED
-  // For now we will not deal with recursive forwards! 
+  // For now we will not deal with recursive forwards!
   // TAO_GIOP_SYSTEM_EXCEPTION;
 
   data_->reset_profiles ();
@@ -401,7 +402,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
 
   // New for Multiple profile.  Get the MProfile list from the
   // forwarded object refererence, and assign it to the current profile
-  // in use.  Note, it should not be the case that the current profile 
+  // in use.  Note, it should not be the case that the current profile
   // in use already has a forward profile defined!  That is, even if we
   // were using a forward_profile in the request which resulted in this
   // location_forward response, it will have a null fwd_mprofiles list.
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 5bc4e3f51e0..2a1942b833d 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -837,7 +837,7 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
   // to create Profiles!
   // We do not use ACE_NEW cause we want to return an exception if this
   // fails.
-  TAO_IIOP_Profile *pfile = 
+  TAO_IIOP_Profile *pfile =
       new TAO_IIOP_Profile (orb_core->orb_params ()->host (),
                             orb_core->orb_params ()->addr ().get_port_number (),
                             key,
@@ -852,11 +852,11 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
     }
   else
     {
-      // We do not use ACE_NEW_RETURN or ACE_NEW since we need 
+      // We do not use ACE_NEW_RETURN or ACE_NEW since we need
       // to dealicate pfile
       // Plus we want to return an exception.
       data = new STUB_Object (id, pfile);
-    
+
       if (data == 0)
         env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
@@ -864,7 +864,7 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
 
   pfile->_decr_refcnt ();
   // STUB_Object will increment the reference count.
-    
+
   return data;
 }
 
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 14f0b5e6753..82fbce47233 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
+// TAO ORB and the TAO IDL Compiler have been developed by Washington
 // University Computer Science's Distributed Object Computing Group.
 //
 // Information on TAO is available at
@@ -65,4 +65,3 @@ operator== (const TAO_ObjectKey &lhs,
 
   return 1;
 }
-
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index e1ba89bb9dd..49bf68bf78d 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -7,7 +7,7 @@
 // Information on TAO is available at
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// Take care: The typecodes are platform dependent, therefor 
+// Take care: The typecodes are platform dependent, therefore
 // a ifdef is needed right now. This is going to be changed in
 // the future.
 
@@ -56,7 +56,7 @@ static const CORBA::Long _oc_PortableServer_ObjectId[] =
   0,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (CORBA::tk_alias, sizeof
-                                                        (_oc_PortableServer_ObjectId), (char *) &_oc_PortableServer_ObjectId, 
+                                                        (_oc_PortableServer_ObjectId), (char *) &_oc_PortableServer_ObjectId,
                                                         0, sizeof (PortableServer::ObjectId));
 CORBA::TypeCode_ptr PortableServer::_tc_ObjectId = &_tc_TAO_tc_PortableServer_ObjectId;
 
@@ -168,10 +168,10 @@ static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (CORBA::tk_except,
                                                               sizeof
-                                                              (_oc_PortableServer_ForwardRequest), 
+                                                              (_oc_PortableServer_ForwardRequest),
                                                               (char *)
-                                                              &_oc_PortableServer_ForwardRequest, 0, 
-                                                              sizeof (PortableServer::ForwardRequest)); 
+                                                              &_oc_PortableServer_ForwardRequest, 0,
+                                                              sizeof (PortableServer::ForwardRequest));
 CORBA::TypeCode_ptr PortableServer::_tc_ForwardRequest = &_tc_TAO_tc_PortableServer_ForwardRequest;
 
 
@@ -261,7 +261,7 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicy[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy (CORBA::tk_objref,
                                                             sizeof
-                                                            (_oc_PortableServer_ThreadPolicy), 
+                                                            (_oc_PortableServer_ThreadPolicy),
                                                             (char *)
                                                             &_oc_PortableServer_ThreadPolicy, 0,
                                                             sizeof (PortableServer::ThreadPolicy));
@@ -279,7 +279,7 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue
 (CORBA::tk_enum, sizeof (_oc_PortableServer_LifespanPolicyValue), (char *)
- &_oc_PortableServer_LifespanPolicyValue, 0, 
+ &_oc_PortableServer_LifespanPolicyValue, 0,
 sizeof (PortableServer::LifespanPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicyValue = &_tc_TAO_tc_PortableServer_LifespanPolicyValue;
 
@@ -355,9 +355,9 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicy[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy (CORBA::tk_objref,
                                                               sizeof
-                                                              (_oc_PortableServer_LifespanPolicy), 
+                                                              (_oc_PortableServer_LifespanPolicy),
                                                               (char *)
-                                                              &_oc_PortableServer_LifespanPolicy, 
+                                                              &_oc_PortableServer_LifespanPolicy,
                                                               0,
                                                               sizeof (PortableServer::LifespanPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicy = &_tc_TAO_tc_PortableServer_LifespanPolicy;
@@ -448,7 +448,7 @@ static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy
 (CORBA::tk_objref, sizeof (_oc_PortableServer_IdUniquenessPolicy), (char *)
- &_oc_PortableServer_IdUniquenessPolicy, 0, 
+ &_oc_PortableServer_IdUniquenessPolicy, 0,
  sizeof (PortableServer::IdUniquenessPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicy = &_tc_TAO_tc_PortableServer_IdUniquenessPolicy;
 
@@ -538,7 +538,7 @@ static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy
 (CORBA::tk_objref, sizeof (_oc_PortableServer_IdAssignmentPolicy), (char *)
- &_oc_PortableServer_IdAssignmentPolicy, 
+ &_oc_PortableServer_IdAssignmentPolicy,
  0,
  sizeof (PortableServer::IdAssignmentPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicy = &_tc_TAO_tc_PortableServer_IdAssignmentPolicy;
@@ -555,7 +555,7 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue
 (CORBA::tk_enum, sizeof (_oc_PortableServer_ImplicitActivationPolicyValue),
- (char *) &_oc_PortableServer_ImplicitActivationPolicyValue, 0, 
+ (char *) &_oc_PortableServer_ImplicitActivationPolicyValue, 0,
  sizeof (PortableServer::ImplicitActivationPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicyValue = &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue;
 
@@ -628,8 +628,8 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] =
   25, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0xfdfdfd),  // name = ImplicitActivationPolicy,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy
-(CORBA::tk_objref, sizeof (_oc_PortableServer_ImplicitActivationPolicy), 
- (char *)&_oc_PortableServer_ImplicitActivationPolicy, 0, 
+(CORBA::tk_objref, sizeof (_oc_PortableServer_ImplicitActivationPolicy),
+ (char *)&_oc_PortableServer_ImplicitActivationPolicy, 0,
  sizeof (PortableServer::ImplicitActivationPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicy = &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy;
 
@@ -644,8 +644,8 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
   11, ACE_NTOHL (0x4e4f4e5f), ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e00fd),  // name = NON_RETAIN
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue
-(CORBA::tk_enum, sizeof (_oc_PortableServer_ServantRetentionPolicyValue), 
- (char *) &_oc_PortableServer_ServantRetentionPolicyValue, 0, 
+(CORBA::tk_enum, sizeof (_oc_PortableServer_ServantRetentionPolicyValue),
+ (char *) &_oc_PortableServer_ServantRetentionPolicyValue, 0,
  sizeof (PortableServer::ServantRetentionPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicyValue = &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue;
 
@@ -809,7 +809,7 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
   24, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900),  // name = RequestProcessingPolicy,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy
-(CORBA::tk_objref, sizeof (_oc_PortableServer_RequestProcessingPolicy), 
+(CORBA::tk_objref, sizeof (_oc_PortableServer_RequestProcessingPolicy),
  (char *) &_oc_PortableServer_RequestProcessingPolicy, 0, sizeof
  (PortableServer::RequestProcessingPolicy));
 CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicy = &_tc_TAO_tc_PortableServer_RequestProcessingPolicy;
@@ -831,7 +831,7 @@ static const CORBA::Long _oc_PortableServer_SynchronizationPolicyValue[] =
     12, ACE_NTOHL (0x54485245), ACE_NTOHL (0x41445f4c), ACE_NTOHL (0x4f434b00),  // name = THREAD_LOCK
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_SynchronizationPolicyValue
-(CORBA::tk_enum, sizeof (_oc_PortableServer_SynchronizationPolicyValue), 
+(CORBA::tk_enum, sizeof (_oc_PortableServer_SynchronizationPolicyValue),
  (char *) &_oc_PortableServer_SynchronizationPolicyValue, 0, sizeof
  (PortableServer::SynchronizationPolicyValue));
 CORBA::TypeCode_ptr PortableServer::_tc_SynchronizationPolicyValue = &_tc_TAO_tc_PortableServer_SynchronizationPolicyValue;
@@ -1058,9 +1058,9 @@ static const CORBA::Long _oc_PortableServer_POAManager[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (CORBA::tk_objref,
                                                           sizeof
-                                                          (_oc_PortableServer_POAManager), 
+                                                          (_oc_PortableServer_POAManager),
                                                           (char *)
-                                                          &_oc_PortableServer_POAManager, 0, 
+                                                          &_oc_PortableServer_POAManager, 0,
                                                           sizeof (PortableServer::POAManager));
 CORBA::TypeCode_ptr PortableServer::_tc_POAManager = &_tc_TAO_tc_PortableServer_POAManager;
 
@@ -1170,9 +1170,9 @@ static const CORBA::Long _oc_PortableServer_ServantManager[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager (CORBA::tk_objref,
                                                               sizeof
-                                                              (_oc_PortableServer_ServantManager), 
+                                                              (_oc_PortableServer_ServantManager),
                                                               (char *)
-                                                              &_oc_PortableServer_ServantManager, 
+                                                              &_oc_PortableServer_ServantManager,
                                                               0,
                                                               sizeof (PortableServer::ServantManager));
 CORBA::TypeCode_ptr PortableServer::_tc_ServantManager = &_tc_TAO_tc_PortableServer_ServantManager;
@@ -1285,11 +1285,11 @@ static const CORBA::Long _oc_PortableServer_ServantLocator[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator (CORBA::tk_objref,
                                                               sizeof
-                                                              (_oc_PortableServer_ServantLocator), 
+                                                              (_oc_PortableServer_ServantLocator),
                                                               (char *)
                                                               &_oc_PortableServer_ServantLocator,
                                                               0,
-                                                              sizeof (PortableServer::ServantLocator)); 
+                                                              sizeof (PortableServer::ServantLocator));
 CORBA::TypeCode_ptr PortableServer::_tc_ServantLocator = &_tc_TAO_tc_PortableServer_ServantLocator;
 
 PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr obj)
@@ -1416,7 +1416,7 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] =
   21, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794578), ACE_NTOHL (0x69737473), ACE_NTOHL (0xfdfdfd),  // name = AdapterAlreadyExists
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterAlreadyExists), 
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterAlreadyExists),
  (char *) &_oc_PortableServer_POA_AdapterAlreadyExists, 0, sizeof
  (PortableServer::POA::AdapterAlreadyExists));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists = &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
@@ -1815,7 +1815,7 @@ static const CORBA::Long _oc_PortableServer_POA_NoServant[] =
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (CORBA::tk_except,
                                                              sizeof
-                                                             (_oc_PortableServer_POA_NoServant), 
+                                                             (_oc_PortableServer_POA_NoServant),
                                                              (char *)
                                                              &_oc_PortableServer_POA_NoServant, 0,
                                                              sizeof (PortableServer::POA::NoServant));
@@ -1913,7 +1913,7 @@ static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] =
   0, // member count
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ObjectAlreadyActive), 
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ObjectAlreadyActive),
  (char *) &_oc_PortableServer_POA_ObjectAlreadyActive, 0, sizeof
  (PortableServer::POA::ObjectAlreadyActive));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive = &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive;
@@ -2107,7 +2107,7 @@ static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] =
   0, // member count
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive
-(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ServantAlreadyActive), 
+(CORBA::tk_except, sizeof (_oc_PortableServer_POA_ServantAlreadyActive),
  (char *) &_oc_PortableServer_POA_ServantAlreadyActive, 0, sizeof
  (PortableServer::POA::ServantAlreadyActive));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive = &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive;
@@ -2601,7 +2601,7 @@ static const CORBA::Long _oc_PortableServer_Current[] =
   8, ACE_NTOHL (0x43757272), ACE_NTOHL (0x656e7400),  // name = Current,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current (CORBA::tk_objref, sizeof
-                                                       (_oc_PortableServer_Current), (char *) &_oc_PortableServer_Current, 
+                                                       (_oc_PortableServer_Current), (char *) &_oc_PortableServer_Current,
                                                        0,
                                                        sizeof (PortableServer::Current));
 CORBA::TypeCode_ptr PortableServer::_tc_Current = &_tc_TAO_tc_PortableServer_Current;
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 5bb99a6e192..766a2dd06f9 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -30,7 +30,7 @@ TAO_Connector_Registry::~TAO_Connector_Registry()
 TAO_Connector *
 TAO_Connector_Registry::get_connector (CORBA::ULong tag)
 {
-  // For now, only IIOP connectors. 
+  // For now, only IIOP connectors.
   if (tag != TAO_IOP_TAG_INTERNET_IOP)
   {
     ACE_DEBUG ((LM_DEBUG, "Invalid connector tag %d\n", tag));
@@ -83,10 +83,10 @@ TAO_Connector_Registry::preconnect (const char* the_preconnections)
 
   // @@ OK, what we should do is parse the string so that we can gather
   // @@ together addresses of the same protocol together and pass to the
-  // @@ appropriate connector.  But, for now we ASSUME they are all 
+  // @@ appropriate connector.  But, for now we ASSUME they are all
   // @@ INET IP:Port!! HACK. fredk
 
-  if (this->iiop_connector_) 
+  if (this->iiop_connector_)
     result = this->iiop_connector_->preconnect(preconnections);
 
   ACE_OS::free (preconnections);
@@ -96,7 +96,7 @@ TAO_Connector_Registry::preconnect (const char* the_preconnections)
 }
 
 TAO_Profile *
-TAO_Connector_Registry::connect (STUB_Object *&obj, 
+TAO_Connector_Registry::connect (STUB_Object *&obj,
                                  CORBA::Environment &env)
 {
   TAO_Profile *profile;
@@ -117,10 +117,11 @@ TAO_Connector_Registry::connect (STUB_Object *&obj,
 
   // here is where we get the appropriate connector object
   // but we are the Connector Registry so call get_connector(tag)
- 
+
   TAO_Connector *connector = this->get_connector(req_tag);
 
   TAO_Transport *transport = connector->connect(profile, env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   if (transport == 0)
     return 0;
@@ -144,7 +145,7 @@ Version::Version (CORBA::Octet maj, CORBA::Octet min)
 {
 }
 
-void 
+void
 Version::set_version (CORBA::Octet maj, CORBA::Octet min)
 {
   this->major = maj;
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index 25f12566329..7837b76436c 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -248,7 +248,7 @@ TAO_TypeCodes::init (void)
     TAO_ENCAP_BYTE_ORDER, // byte order
     25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/Identifier:1.0
     11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x657200fd),  // name = Identifier
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0, // string length
   };
 
@@ -263,7 +263,7 @@ TAO_TypeCodes::init (void)
     TAO_ENCAP_BYTE_ORDER, // byte order
     27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:CORBA/RepositoryId:1.0
     13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0xfdfdfd),  // name = RepositoryId
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0, // string length
   };
   CORBA::_tc_RepositoryId = new CORBA::TypeCode (CORBA::tk_alias,
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index fb0568a1f49..0d85d4512d3 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -157,7 +157,7 @@
 #define TAO_NAMESPACE_DEFINE(TYPE,NAME,RHS) NAME = RHS;
 #endif /* ACE_HAS_USING_KEYWORD */
 
-// Instead of replacing this with the ACE macro 
+// Instead of replacing this with the ACE macro
 // in 20+ files, define it conditionally.
 // The TAO_OutputCDR class uses the ACE macro, which
 // is defined by default.