ChangeLogTag:Mon May 15 15:40:46 2000 Ossama Othman <ossama@uci.edu>

3 files changed, 52 insertions, 34 deletions

diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp
index e79ee4e9c76..dc9427abd4c 100644
--- a/TAO/tao/IIOP_Connect.cpp
+++ b/TAO/tao/IIOP_Connect.cpp
@@ -149,20 +149,23 @@ TAO_IIOP_Server_Connection_Handler::open (void*)
   // operation fails we are out of luck (some platforms do not support
   // it and return -1).
 
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.
+  // Called by the <Strategy_Acceptor> when the handler is
+  // completely connected.
   ACE_INET_Addr addr;
 
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
 
-  char client[MAXHOSTNAMELEN + 16];
-  (void) addr.addr_to_string (client, sizeof (client));
-
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) IIOP connection from client <%s> on %d\n"),
-                client, this->peer ().get_handle ()));
+    {
+      char client[MAXHOSTNAMELEN + 16];
+      (void) addr.addr_to_string (client, sizeof (client));
+
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) IIOP connection from client")
+                  ACE_TEXT ("<%s> on %d\n"),
+                  client, this->peer ().get_handle ()));
+    }
 
   return 0;
 }
@@ -422,14 +425,17 @@ TAO_IIOP_Client_Connection_Handler::open (void *)
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
 
-  char server[MAXHOSTNAMELEN + 16];
+  if (TAO_debug_level > 0)
+    {
+      char server[MAXHOSTNAMELEN + 16];
 
-  (void) addr.addr_to_string (server, sizeof (server));
+      (void) addr.addr_to_string (server, sizeof (server));
 
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) IIOP connection to server <%s> on %d\n"),
-                server, this->peer ().get_handle ()));
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) IIOP connection to server ")
+                  ACE_TEXT ("<%s> on %d\n"),
+                  server, this->peer ().get_handle ()));
+    }
 
   // Register the handler with the Reactor if necessary.
   return this->transport ()->wait_strategy ()->register_handler ();
diff --git a/TAO/tao/SHMIOP_Connect.cpp b/TAO/tao/SHMIOP_Connect.cpp
index daa80220398..989d8ff5ff9 100644
--- a/TAO/tao/SHMIOP_Connect.cpp
+++ b/TAO/tao/SHMIOP_Connect.cpp
@@ -156,13 +156,16 @@ TAO_SHMIOP_Server_Connection_Handler::open (void*)
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
 
-  char client[MAXHOSTNAMELEN + 16];
-  (void) addr.addr_to_string (client, sizeof (client));
-
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) SHMIOP connection from client <%s> on %d\n"),
-                client, this->peer ().get_handle ()));
+    {
+      char client[MAXHOSTNAMELEN + 16];
+      (void) addr.addr_to_string (client, sizeof (client));
+
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) SHMIOP connection from ")
+                  ACE_TEXT ("client <%s> on %d\n"),
+                  client, this->peer ().get_handle ()));
+    }
 
   return 0;
 }
@@ -414,14 +417,17 @@ TAO_SHMIOP_Client_Connection_Handler::open (void *)
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
 
-  char server[MAXHOSTNAMELEN + 16];
+  if (TAO_debug_level > 0)
+    {
+      char server[MAXHOSTNAMELEN + 16];
 
-  (void) addr.addr_to_string (server, sizeof (server));
+      (void) addr.addr_to_string (server, sizeof (server));
 
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) SHMIOP connection to server <%s> on %d\n"),
-                server, this->peer ().get_handle ()));
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) SHMIOP connection to ")
+                  ACE_TEXT ("server <%s> on %d\n"),
+                  server, this->peer ().get_handle ()));
+    }
 
   // Register the handler with the Reactor if necessary.
   return this->transport ()->wait_strategy ()->register_handler ();
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
index ca0edfdad62..e42084fb1a8 100644
--- a/TAO/tao/UIOP_Connect.cpp
+++ b/TAO/tao/UIOP_Connect.cpp
@@ -151,9 +151,10 @@ TAO_UIOP_Server_Connection_Handler::open (void*)
     return -1;
 
   if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) UIOP connection from client <%s> on %d\n",
-                  addr.get_path_name (), this->peer ().get_handle ()));
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT ("TAO (%P|%t) UIOP connection from client ")
+                ACE_TEXT ("<%s> on %d\n"),
+                addr.get_path_name (), this->peer ().get_handle ()));
 
   return 0;
 }
@@ -397,7 +398,8 @@ TAO_UIOP_Client_Connection_Handler::open (void *)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) UIOP connection to server <%s> on %d\n",
+                ACE_TEXT ("TAO (%P|%t) UIOP connection to server ")
+                ACE_TEXT ("<%s> on %d\n"),
                 addr.get_path_name (), this->peer ().get_handle ()));
 
   // Register the handler with the Reactor if necessary.
@@ -469,8 +471,9 @@ TAO_UIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
 
   if (TAO_orbdebug)
     ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) UIOP_Client_Connection_Handler::handle_close"
-                 " (%d, %d)\n",
+                 ACE_TEXT ("TAO (%P|%t) ")
+                 ACE_TEXT ("UIOP_Client_Connection_Handler::handle_close")
+                 ACE_TEXT (" (%d, %d)\n"),
                  handle,
                  rm));
 
@@ -494,8 +497,11 @@ TAO_UIOP_Client_Connection_Handler::handle_close_i (ACE_HANDLE handle,
 
   if (TAO_debug_level > 0)
     ACE_DEBUG  ((LM_DEBUG,
-                 "TAO (%P|%t) IIOP_Client_Connection_Handler::"
-                 "handle_close_i (%d, %d)\n", handle, rm));
+                 ACE_TEXT ("TAO (%P|%t) ")
+                 ACE_TEXT ("IIOP_Client_Connection_Handler::")
+                 ACE_TEXT ("handle_close_i (%d, %d)\n"),
+                 handle,
+                 rm));
 
   if (this->recycler ())
     this->recycler ()->mark_as_closed_i (this->recycling_act ());