Thu Apr 11 18:03:24 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp
index fab1fe5d253..7326bccad4c 100644
--- a/TAO/tao/HTTP_Handler.cpp
+++ b/TAO/tao/HTTP_Handler.cpp
@@ -7,6 +7,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
+#include "tao/debug.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -35,10 +36,10 @@ int
 TAO_HTTP_Handler::open (void *)
 {
   if (this->send_request () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, send_request failed\n"), -1);
+    TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, send_request failed\n"), -1);
 
   if (this->receive_reply () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, receive_reply failed\n"), -1);
+    TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, receive_reply failed\n"), -1);
   return 0;
 
 }
@@ -88,7 +89,7 @@ TAO_HTTP_Reader::send_request (void)
   if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_)
                          + ACE_OS::strlen (filename_)
                          + ACE_OS::strlen (request_suffix_) + 4))
-    ACE_ERROR_RETURN((LM_ERROR,"TAO (%P|%t) - HTTP_Reader::send_request, request too large!"), -1);
+    TAOLIB_ERROR_RETURN((LM_ERROR,"TAO (%P|%t) - HTTP_Reader::send_request, request too large!"), -1);
 
   // Create a message to send to the server requesting retrieval of the file
   int const len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_,
@@ -97,7 +98,7 @@ TAO_HTTP_Reader::send_request (void)
 
   // Send the message to server
   if (peer ().send_n (mesg, len) != len)
-    ACE_ERROR_RETURN((LM_ERROR,"TAO (%P|%t) - HTTP_Reader::send_request, error sending request\n"), -1);
+    TAOLIB_ERROR_RETURN((LM_ERROR,"TAO (%P|%t) - HTTP_Reader::send_request, error sending request\n"), -1);
 
   return 0;
 }
@@ -116,7 +117,7 @@ TAO_HTTP_Reader::receive_reply (void)
     {
       //Make sure that response type is 200 OK
       if (ACE_OS::strstr (buf,"200 OK") == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
+        TAOLIB_ERROR_RETURN ((LM_ERROR,
                             "TAO (%P|%t) - HTTP_Reader::receive_reply, Response is not 200 OK\n" ), -1);
 
       // Search for the header termination string "\r\n\r\n", or "\n\n". If
@@ -135,7 +136,7 @@ TAO_HTTP_Reader::receive_reply (void)
     }
   else
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
+      TAOLIB_ERROR_RETURN ((LM_ERROR,
                          "TAO (%P|%t) - HTTP_Reader::receive_reply, error while reading header\n"), -1);
     }
 
@@ -155,7 +156,7 @@ TAO_HTTP_Reader::receive_reply (void)
   // Copy over all the data bytes into our message buffer.
   if (curr->copy (buf_ptr, bytes_read) == -1)
     {
-      ACE_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Reader::receive_reply, error copying data into Message_Block\n"), -1);
+      TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Reader::receive_reply, error copying data into Message_Block\n"), -1);
     }
 
   // read the rest of the data into a number of ACE_Message_Blocks and
@@ -184,7 +185,7 @@ TAO_HTTP_Reader::receive_reply (void)
     }
   else
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
+      TAOLIB_ERROR_RETURN ((LM_ERROR,
                          "TAO (%P|%t) - HTTP_Reader::receive_reply, Error while reading header\n"), -1);
     }
   } while (num_recvd != 0);