diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-30 17:40:05 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-30 17:40:05 -0400 |
| commit | 8ef77a84544c63dd7829bc5c76198b9c497a11b9 (patch) | |
| tree | 7b9c0a3bce4a95405d7ea3bfd8e19431968d5e94 /cpp | |
| parent | minor slice2html fix for 3.7 (diff) | |
| download | ice-8ef77a84544c63dd7829bc5c76198b9c497a11b9.tar.bz2 ice-8ef77a84544c63dd7829bc5c76198b9c497a11b9.tar.xz ice-8ef77a84544c63dd7829bc5c76198b9c497a11b9.zip | |
Fixed logging message
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 170c7b95d1e..ce042d87ba5 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -2588,14 +2588,7 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingMessage>& callbacks) OutputStream stream(_instance.get(), Ice::currentProtocolEncoding); doCompress(*message->stream, stream); - if(message->outAsync) - { - trace("sending asynchronous request", *message->stream, _logger, _traceLevels); - } - else - { - traceSend(*message->stream, _logger, _traceLevels); - } + traceSend(*message->stream, _logger, _traceLevels); message->adopt(&stream); // Adopt the compressed stream. message->stream->i = message->stream->b.begin(); @@ -2622,14 +2615,8 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingMessage>& callbacks) copy(p, p + sizeof(Int), message->stream->b.begin() + 10); #endif message->stream->i = message->stream->b.begin(); - if(message->outAsync) - { - trace("sending asynchronous request", *message->stream, _logger, _traceLevels); - } - else - { - traceSend(*message->stream, _logger, _traceLevels); - } + traceSend(*message->stream, _logger, _traceLevels); + #ifdef ICE_HAS_BZIP2 } #endif @@ -2714,14 +2701,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message) doCompress(*message.stream, stream); stream.i = stream.b.begin(); - if(message.outAsync) - { - trace("sending asynchronous request", *message.stream, _logger, _traceLevels); - } - else - { - traceSend(*message.stream, _logger, _traceLevels); - } + traceSend(*message.stream, _logger, _traceLevels); // // Send the message without blocking. @@ -2776,14 +2756,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message) #endif message.stream->i = message.stream->b.begin(); - if(message.outAsync) - { - trace("sending asynchronous request", *message.stream, _logger, _traceLevels); - } - else - { - traceSend(*message.stream, _logger, _traceLevels); - } + traceSend(*message.stream, _logger, _traceLevels); // // Send the message without blocking. |