diff --git a/ACE/ace/Ping_Socket.cpp b/ACE/ace/Ping_Socket.cpp
index d806a30b1eef3..71e40d6d603a9 100644
--- a/ACE/ace/Ping_Socket.cpp
+++ b/ACE/ace/Ping_Socket.cpp
@@ -2,6 +2,7 @@
 
 #if defined (ACE_HAS_ICMP_SUPPORT) && (ACE_HAS_ICMP_SUPPORT == 1)
 
+#include "ace/ACE.h"
 #include "ace/INET_Addr.h"
 #include "ace/Log_Category.h"
 #include "ace/OS_NS_string.h"
@@ -110,9 +111,10 @@ ACE_Ping_Socket::ACE_Ping_Socket (ACE_Addr const & local,
 
   if (this->open (local, protocol, reuse_addr) == -1)
     {
-      ACELIB_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("ACE_Ping_Socket::ACE_Ping_Socket: %p\n"),
-                  ACE_TEXT ("open")));
+      if (ACE::debug())
+        ACELIB_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("ACE_Ping_Socket::ACE_Ping_Socket: %p\n"),
+                    ACE_TEXT ("open")));
       return;
     }
 
@@ -222,11 +224,12 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len)
 
   if ((icmplen = len - hlen1) < ICMP_MIN)
     {
-      ACELIB_DEBUG
-        ((LM_DEBUG,
-          ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram")
-          ACE_TEXT (" - ICMP length is %b < 8.\n"),
-          icmplen));
+      if (ACE::debug())
+        ACELIB_DEBUG
+          ((LM_DEBUG,
+            ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram")
+            ACE_TEXT (" - ICMP length is %b < 8.\n"),
+            icmplen));
       ACELIB_ERROR_RETURN
         ((LM_ERROR,
           ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram - ")
@@ -236,10 +239,11 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len)
 
   if (icmp->icmp_type == ICMP_ECHOREPLY)
     {
-      ACELIB_DEBUG
-        ((LM_DEBUG,
-          ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram")
-          ACE_TEXT (" - ICMP_ECHOREPLY received.\n")));
+      if (ACE::debug())
+        ACELIB_DEBUG
+          ((LM_DEBUG,
+            ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram")
+            ACE_TEXT (" - ICMP_ECHOREPLY received.\n")));
 
       if (icmp->icmp_id != (ACE_OS::getpid () & 0xFFFF))
         {
@@ -263,21 +267,23 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len)
              -1);
         }
 
-      ACELIB_DEBUG
-        ((LM_DEBUG,
-          ACE_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ")
-          ACE_TEXT ("received ")
-          ACE_TEXT ("ICMP datagram with length of %b bytes (not counting ")
-          ACE_TEXT ("IP-header): seq=%u, ttl=%d.\n"),
-          icmplen, icmp->icmp_seq, ip->ip_ttl));
+      if (ACE::debug())
+        ACELIB_DEBUG
+          ((LM_DEBUG,
+            ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram - ")
+            ACE_TEXT ("received ")
+            ACE_TEXT ("ICMP datagram with length of %b bytes (not counting ")
+            ACE_TEXT ("IP-header): seq=%u, ttl=%d.\n"),
+            icmplen, icmp->icmp_seq, ip->ip_ttl));
 
       return 0; //= success
     }
 
-  ACELIB_DEBUG
-    ((LM_DEBUG,
-      ACE_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ")
-      ACE_TEXT ("received datagram that is not ICMP_ECHOREPLY.\n")));
+  if (ACE::debug())
+    ACELIB_DEBUG
+      ((LM_DEBUG,
+        ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram - ")
+        ACE_TEXT ("received datagram that is not ICMP_ECHOREPLY.\n")));
 
   return -1;
 }
@@ -352,16 +358,16 @@ ACE_Ping_Socket::make_echo_check (ACE_INET_Addr & remote_addr,
                                   bool to_connect,
                                   ACE_Time_Value const * timeout)
 {
-  int rval_send = -1;
+  const int rval_send = this->send_echo_check (remote_addr, to_connect);
 
-  if ((rval_send = this->send_echo_check (remote_addr,
-                                          to_connect)) == -1)
+  if (rval_send == -1)
     return -1;
 
-  ACELIB_DEBUG
-    ((LM_DEBUG,
-      ACE_TEXT ("(%P|%t) ACE_Ping_Socket::make_echo_check - sent %d.\n"),
-      rval_send));
+  if (ACE::debug())
+    ACELIB_DEBUG
+      ((LM_DEBUG,
+        ACE_TEXT ("(%P|%t) ACE_Ping_Socket::make_echo_check - sent %d bytes.\n"),
+        rval_send));
 
   return this->receive_echo_reply (timeout);
 }