ChangeLogTag: Thu Aug 12 11:55:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 29 insertions, 11 deletions

diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 945ec05b3e2..3af1ca6500f 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -131,8 +131,8 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile,
                      this->codeset_info_.ForCharData);
        if (TAO_debug_level > 2)
          ACE_DEBUG ((LM_DEBUG,
-                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs ")
-                     ACE_TEXT("setting char translator(%08x)\n"),
+                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
+                     ACE_TEXT("setting char translator (%08x)\n"),
                      tcs));
        trans.char_translator(this->get_char_trans (tcs));
 
@@ -141,7 +141,7 @@ TAO_Codeset_Manager::set_tcs (TAO_Profile &theProfile,
 
        if (TAO_debug_level > 2)
          ACE_DEBUG ((LM_DEBUG,
-                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs ")
+                     ACE_TEXT("TAO (%P|%t) - Codeset_Manager::set_tcs, ")
                      ACE_TEXT("setting wchar translator (%08x)\n"),
                      tcs));
        trans.wchar_translator(this->get_wchar_trans (tcs));
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 2db80b17e0f..5e0137818a9 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -255,6 +255,14 @@ TAO_IIOP_Connection_Handler::process_listen_point_list (
   // Get the size of the list
   const CORBA::ULong len = listen_list.length ();
 
+  if (TAO_debug_level > 0 && len == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::")
+                  ACE_TEXT("process_listen_point_list, ")
+                  ACE_TEXT("Received list of size 0, check client config.\n")));
+    }
+
   for (CORBA::ULong i = 0; i < len; ++i)
     {
       IIOP::ListenPoint listen_point = listen_list[i];
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 3151824b184..cc77eb99222 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -320,14 +320,25 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
             {
               if (TAO_debug_level > 0)
                 ACE_ERROR ((LM_ERROR,
-                            "TAO (%P|%t) - IIOP_Transport::set_bidir_info, "
-                            "error getting listen_point \n"));
+                            "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, "
+                            "error getting listen_point\n"));
 
               return;
             }
         }
     }
 
+  if (listen_point_list.length () == 0)
+    {
+      if (TAO_debug_level > 0)
+        ACE_ERROR ((LM_ERROR,
+                    "TAO (%P|%t) - IIOP_Transport::set_bidir_context_info, "
+                    "listen_point list is empty, client should send a list "
+                    "with at least one point\n"));
+
+      return;
+    }
+
   // We have the ListenPointList at this point. Create a output CDR
   // stream at this point
   TAO_OutputCDR cdr;
@@ -370,9 +381,8 @@ TAO_IIOP_Transport::get_listen_point (
       == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) Could not resolve local ")
-                         ACE_TEXT ("host address in ")
-                         ACE_TEXT ("get_listen_point()\n")),
+                         ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ")
+                         ACE_TEXT ("could not resolve local host address\n")),
                         -1);
     }
 
@@ -387,8 +397,8 @@ TAO_IIOP_Transport::get_listen_point (
                                local_interface.out ()) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) Could not resolve local host ")
-                         ACE_TEXT ("name \n")),
+                         ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ")
+                         ACE_TEXT ("could not resolve local host name\n")),
                         -1);
     }
 
@@ -396,7 +406,7 @@ TAO_IIOP_Transport::get_listen_point (
        index < count;
        ++index)
     {
-      if (local_addr.get_ip_address()
+      if (local_addr.get_ip_address ()
           == endpoint_addr[index].get_ip_address ())
         {
           // Get the count of the number of elements