Tue Oct 10 09:19:12 2006 Johnny Willemsen <jwillemsen@remedy.nl>

25 files changed, 83 insertions, 76 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3eea12f3cae..2a7628a0378 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,38 @@
+Tue Oct 10 09:19:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+	* tao/Connection_Handler.cpp:
+	  Layout change
+
+	* tao/CORBALoc_Parser.{h,cpp}:
+	* tao/CORBAName_Parser.{h,cpp}:
+	* tao/DLL_Parser.{h,cpp}:
+	* tao/FILE_Parser.{h,cpp}:
+	* tao/IOR_Parser.{h,cpp}:
+	* tao/MCAST_Parser.{h,cpp}:
+	  Changed match_prefix to return a bool instead of an int.
+
+	* tao/CORBALoc_Parser.cpp:
+	* tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+	* tao/Environment.cpp:
+	* tao/Exception.cpp:
+	* tao/IIOP_Connector.cpp:
+	* tao/IIOP_Profile.cpp:
+	* tao/ORB_Core.cpp:
+	* tao/Strategies/SCIOP_Connector.cpp:
+	* tao/Strategies/UIOP_Connector.cpp:
+	* tao/SystemException.cpp:
+	  When using LM_ERROR, use ACE_ERROR as macro
+
+	* tao/IIOP_Connection_Handler.cpp:
+	  Const improvment
+
+	* tao/ObjRefTemplate/ObjectReferenceTemplate.pidl:
+	  Cleanup of comment
+
+	* tao/Strategies/DIOP_Profile.cpp:
+	  Small code improvement assuming the fact that operator>> returns
+	  bool
+
 Tue Oct 10 06:08:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 	* tests/COIOP/*:
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 5db5fa9afba..75bd6179945 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -33,7 +33,7 @@ TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void)
 {
 }
 
-int
+bool
 TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const
 {
   // Check if the prefix is 'corbaloc:' and return the result.
@@ -310,7 +310,7 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior,
           // No valid IPv6 address specified but that will come out later.
           if (TAO_debug_level > 0)
             {
-              ACE_DEBUG ((LM_ERROR,
+              ACE_ERROR ((LM_ERROR,
                          ACE_TEXT ("\nTAO (%P|%t) TAO_CORBALOC_Parser: ")
                          ACE_TEXT ("Invalid IPv6 decimal address specified.\n")));
             }
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index fcf59c35329..bf085b2f508 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -52,7 +52,7 @@ public:
 
   /// = The IOR_Parser methods, please read the documentation in
   ///   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
+  virtual bool match_prefix (const char *ior_string) const;
 
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 8924feee395..328bb860795 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -25,7 +25,7 @@ TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser (void)
 {
 }
 
-int
+bool
 TAO_CORBANAME_Parser::match_prefix (const char *ior_string) const
 {
   return (ACE_OS::strncmp (ior_string,
@@ -36,8 +36,7 @@ TAO_CORBANAME_Parser::match_prefix (const char *ior_string) const
 CORBA::Object_ptr
 TAO_CORBANAME_Parser::
 parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
-                                     ACE_CString &key_string
-                                     ACE_ENV_ARG_DECL)
+                                     ACE_CString &key_string)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Arg_Traits<CORBA::Object>::ret_val _tao_retval;
@@ -56,8 +55,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
                                     11,
                                     0);
 
-  tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
+  tao_call.invoke (0, 0);
 
   return _tao_retval.retn ();
 }
diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h
index 9580d770885..ada5f625df5 100644
--- a/TAO/tao/CORBANAME_Parser.h
+++ b/TAO/tao/CORBANAME_Parser.h
@@ -45,18 +45,17 @@ public:
 
   // = The IOR_Parser methods, please read the documentation in
   //   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
+  virtual bool match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::ORB_ptr orb)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
-  virtual CORBA::Object_ptr
-    parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
-                                         ACE_CString &key_string
-                                         ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+   virtual CORBA::Object_ptr
+   parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
+                                        ACE_CString &key_string
+                                        ACE_ENV_ARG_DECL)
+     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
index fd03281a261..36d0e798d78 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
@@ -129,7 +129,7 @@ TAO::CSD::TP_Strategy_Factory::init (int argc,
       {
         if (TAO_debug_level > 0)
           {
-            ACE_DEBUG ((LM_ERROR,
+            ACE_ERROR ((LM_ERROR,
                         ACE_TEXT("CSD_ORB_Loader: Unknown option ")
                         ACE_TEXT("<%s>.\n"),
                         argv[curarg]));
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 08cc2fc2eb0..850d93da175 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -414,7 +414,7 @@ int
 TAO_Connection_Handler::close_handler (void)
 {
   this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
-	               this->orb_core_->leader_follower ());
+                       this->orb_core_->leader_follower ());
   this->transport ()->remove_reference ();
   return 0;
 }
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index 87fb45d897f..cbd0cd1d0f2 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -26,7 +26,7 @@ TAO_DLL_Parser::~TAO_DLL_Parser (void)
 }
 
 
-int
+bool
 TAO_DLL_Parser::match_prefix (const char *ior_string) const
 {
   return (ACE_OS::strncmp (ior_string,
@@ -36,8 +36,7 @@ TAO_DLL_Parser::match_prefix (const char *ior_string) const
 
 CORBA::Object_ptr
 TAO_DLL_Parser::parse_string (const char *ior,
-                              CORBA::ORB_ptr orb
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ORB_ptr orb)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
@@ -62,7 +61,7 @@ TAO_DLL_Parser::parse_string (const char *ior,
          CORBA::Object::_nil ());
     }
 
-  return loader->create_object (orb, 0, 0 ACE_ENV_ARG_PARAMETER);
+  return loader->create_object (orb, 0, 0);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h
index 62feb63a54c..1598bf85a6a 100644
--- a/TAO/tao/DLL_Parser.h
+++ b/TAO/tao/DLL_Parser.h
@@ -84,10 +84,9 @@ public:
 
   // = The IOR_Parser methods, please read the documentation in
   //   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
+  virtual bool match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::ORB_ptr orb)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 8b03a420410..80ed0821dab 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -187,7 +187,7 @@ CORBA::Environment::print_exception (const char *info,
     {
       const char *id = this->exception_->_rep_id ();
 
-      ACE_DEBUG ((LM_ERROR,
+      ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"),
                   ACE_TEXT_CHAR_TO_TCHAR (info)));
 
@@ -200,12 +200,12 @@ CORBA::Environment::print_exception (const char *info,
         // @@ we can use the exception's typecode to dump all the data
         // held within it ...
 
-        ACE_DEBUG ((LM_ERROR,
+        ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("TAO: (%P|%t) user exception, ID '%s'\n"),
                     ACE_TEXT_CHAR_TO_TCHAR (id)));
     }
   else
-    ACE_DEBUG ((LM_ERROR,
+    ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (info)));
 }
 
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 4ee58c62355..fe07331cebb 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -91,7 +91,7 @@ void
 CORBA::Exception::_tao_print_exception (const char *user_provided_info,
                                         FILE *) const
 {
-  ACE_DEBUG ((LM_ERROR,
+  ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("(%P|%t) EXCEPTION, %s\n")
               ACE_TEXT ("%s\n"),
               ACE_TEXT_CHAR_TO_TCHAR (user_provided_info),
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index b092eea96be..91579c20c98 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -27,7 +27,7 @@ TAO_FILE_Parser::~TAO_FILE_Parser (void)
 }
 
 
-int
+bool
 TAO_FILE_Parser::match_prefix (const char *ior_string) const
 {
   return (ACE_OS::strncmp (ior_string,
diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h
index 70ef8805d96..2242d33a219 100644
--- a/TAO/tao/FILE_Parser.h
+++ b/TAO/tao/FILE_Parser.h
@@ -32,7 +32,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * This class implements the <file:> IOR format.
  * It is dynamically loaded by the ORB and used to open a file,
- * read its contents and then interepret the file as an IOR (that
+ * read its contents and then interprete the file as an IOR (that
  * can be in any valid format).
  */
 class TAO_FILE_Parser : public TAO_IOR_Parser
@@ -44,7 +44,7 @@ public:
 
   // = The IOR_Parser methods, please read the documentation in
   //   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
+  virtual bool match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
                                           ACE_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index bfffa04b466..447c3d511ee 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -296,7 +296,7 @@ TAO_IIOP_Connection_Handler::close_connection (void)
 {
   // To maintain maximum compatibility, we only set this socket option
   // if the user has provided a linger timeout.
-  int linger = this->orb_core()->orb_params()->linger ();
+  int const linger = this->orb_core()->orb_params()->linger ();
   if (linger != -1)
     {
       struct linger lval;
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 909c7bbf999..e2aa959519d 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -193,7 +193,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
        // Give users a clue to the problem.
       if (TAO_debug_level > 1)
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%P|%t) IIOP_Connector::make_connection, ")
                       ACE_TEXT("connection to <%s:%d> failed (%p)\n"),
                       ACE_TEXT_CHAR_TO_TCHAR (iiop_endpoint->host ()),
@@ -459,7 +459,7 @@ TAO_IIOP_Connector::complete_connection (int result,
         {
           for (unsigned i = 0; i < count; i++)
             {
-              ACE_DEBUG ((LM_ERROR,
+              ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("(%P|%t) IIOP_Connector::make_connection,")
                           ACE_TEXT (" connection to <%s:%d> failed (%p)\n"),
                           ACE_TEXT_CHAR_TO_TCHAR (ep_list[i]->host ()),
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index f8b0242bed0..63cc46e53f8 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -160,7 +160,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
           // No valid IPv6 address specified.
           if (TAO_debug_level > 0)
             {
-              ACE_DEBUG ((LM_ERROR,
+              ACE_ERROR ((LM_ERROR,
                        ACE_TEXT ("\nTAO (%P|%t) IIOP_Profile: ")
                        ACE_TEXT ("Invalid IPv6 decimal address specified.\n")));
             }
@@ -188,7 +188,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
       // See formal-04-03-01, section 13.6.10.3
       if (TAO_debug_level > 0)
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACE_ERROR ((LM_ERROR,
                    ACE_TEXT ("\nTAO (%P|%t) IIOP_Profile: ")
                    ACE_TEXT ("Host address may be omited only when no port has been specified.\n")));
         }
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
index 0058a743a0e..4dffe43fa50 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -52,7 +52,7 @@ public:
 
   /// Return 1 if @a ior_string starts with a prefix known to this IOR
   /// parser
-  virtual int match_prefix (const char *ior_string) const = 0;
+  virtual bool match_prefix (const char *ior_string) const = 0;
 
   /**
    * Parse the @a ior argument and return an object reference.
@@ -60,8 +60,7 @@ public:
    * INV_OBJREF, etc.)
    */
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL)
+                                          CORBA::ORB_ptr orb)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 4aee969cd64..a816035353b 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -29,7 +29,7 @@ TAO_MCAST_Parser::~TAO_MCAST_Parser (void)
 {
 }
 
-int
+bool
 TAO_MCAST_Parser::match_prefix (const char *ior_string) const
 {
   return (ACE_OS::strncmp (ior_string,
@@ -385,7 +385,7 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
           // No valid IPv6 address specified.
           if (TAO_debug_level > 0)
             {
-              ACE_DEBUG ((LM_ERROR,
+              ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("\nTAO (%P|%t) MCAST_Parser: ")
                           ACE_TEXT ("Invalid IPv6 decimal address specified.\n")));
             }
diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h
index 847b28b426f..d8132a6f52f 100644
--- a/TAO/tao/MCAST_Parser.h
+++ b/TAO/tao/MCAST_Parser.h
@@ -47,7 +47,7 @@ public:
 
   /// = The IOR_Parser methods, please read the documentation in
   ///   IOR_Parser.h
-  virtual int match_prefix (const char *ior_string) const;
+  virtual bool match_prefix (const char *ior_string) const;
 
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index fb9de1c478d..d347298dc96 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1069,7 +1069,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           if (TAO_debug_level > 0)
             {
               current_arg = arg_shifter.get_current ();
-              ACE_DEBUG ((LM_ERROR,
+              ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("ERROR: Unknown \"-ORB\" option ")
                           ACE_TEXT ("<%s>.\n"),
                           ((current_arg == 0) ? ACE_TEXT("<NULL>")
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 8ec779c75cf..10be1dc230e 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -6,30 +6,8 @@
  * $Id$
  *
  * @brief Pre-compiled IDL source for the ObjectReferenceTemplate module.
- *
- * This file is used to generate ObjectReferenceTemplateC.{h,i,cpp},
- * using the following command:
- *
- *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -GA
- *        -I$(TAO_ROOT)
- *        -Wb,export_macro=TAO_ORT_Export
- *        -Wb,export_include=ort_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        ObjectReferenceTemplate.pidl
- *
- * and then:
- *
- * cp orig/ObjectReferenceTemplateC.{h,i,cpp} .
- * patch < diffs/ObjectReferenceTemplate.diff
- *
- * The code left in ObjectReferenceTemplateC.{h,i,cpp} is ready for use.
- *
  */
 
-// File: ObjectReferenceTemplate.idl
-
 #ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_
 #define _OBJECT_REFERENCE_TEMPLATE_IDL_
 
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index cfe07e382d7..9ce819cebb8 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -441,7 +441,7 @@ TAO_DIOP_Profile::decode_endpoints (void)
       // Extract endpoints sequence.
       TAO::IIOPEndpointSequence endpoints;
 
-      if ((in_cdr >> endpoints) == 0)
+      if (! (in_cdr >> endpoints))
         return -1;
 
       // Get the priority of the first endpoint (head of the list.
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 70f61e87ae0..d5facd3b3de 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -172,9 +172,9 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
   this->active_connect_strategy_->synch_options (timeout,
                                                  synch_options);
 
-  // The code used to set the timeout to zero, with the intent of 
+  // The code used to set the timeout to zero, with the intent of
   // polling the reactor for connection completion. However, the side-effect
-  // was to cause the connection to timeout immediately. 
+  // was to cause the connection to timeout immediately.
 
   TAO_SCIOP_Connection_Handler *svc_handler = 0;
 
@@ -253,7 +253,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
       // Give users a clue to the problem.
       if (TAO_debug_level)
         {
-          ACE_DEBUG ((LM_ERROR,
+          ACE_ERROR ((LM_ERROR,
                       "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
                       "connection to <%s:%d> failed (%p)\n",
                       sciop_endpoint->host (), sciop_endpoint->port (),
@@ -263,7 +263,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (transport->connection_handler ()->keep_waiting ()) 
+  if (transport->connection_handler ()->keep_waiting ())
     {
       svc_handler->add_reference ();
     }
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 3bbec64d87e..26fdd07992a 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -169,9 +169,9 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
   this->active_connect_strategy_->synch_options (max_wait_time,
                                                  synch_options);
 
-  // The code used to set the timeout to zero, with the intent of 
+  // The code used to set the timeout to zero, with the intent of
   // polling the reactor for connection completion. However, the side-effect
-  // was to cause the connection to timeout immediately. 
+  // was to cause the connection to timeout immediately.
 
   TAO_UIOP_Connection_Handler *svc_handler = 0;
 
@@ -234,7 +234,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
     {
       // Give users a clue to the problem.
       if (TAO_debug_level > 3)
-          ACE_DEBUG ((LM_ERROR,
+          ACE_ERROR ((LM_ERROR,
                       "TAO (%P|%t) - UIOP_Connector::make_connection, "
                       "connection to <%s> failed (%p)\n",
                       uiop_endpoint->rendezvous_point (),
@@ -243,7 +243,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (transport->connection_handler ()->keep_waiting ()) 
+  if (transport->connection_handler ()->keep_waiting ())
     {
       svc_handler->add_reference ();
     }
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index a55e9cc3b6a..d36d045a4e5 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -223,7 +223,7 @@ CORBA::SystemException::_tao_minor_code (u_int location,
 void
 CORBA::SystemException::_tao_print_system_exception (FILE *) const
 {
-  ACE_DEBUG ((LM_ERROR,
+  ACE_ERROR ((LM_ERROR,
               ACE_TEXT("(%P|%t) system exception, ID '%s'\n"),
               ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ())));
 }