diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-07-12 14:07:08 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-07-12 14:07:08 +0200 |
| commit | e0064a1ce41067e40eb1495745e3499e836f1a61 (patch) | |
| tree | ca41e7d77ff2da9d02775a4209c2e0009868053d /cpp/src/Ice/TcpTransceiver.cpp | |
| parent | ICE-5377 - clang optimized build failure (diff) | |
| download | ice-e0064a1ce41067e40eb1495745e3499e836f1a61.tar.bz2 ice-e0064a1ce41067e40eb1495745e3499e836f1a61.tar.xz ice-e0064a1ce41067e40eb1495745e3499e836f1a61.zip | |
Fix to allow transceivers to read more data than requested.
Diffstat (limited to 'cpp/src/Ice/TcpTransceiver.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpTransceiver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp index d82fafa17ce..c29391fa9da 100644 --- a/cpp/src/Ice/TcpTransceiver.cpp +++ b/cpp/src/Ice/TcpTransceiver.cpp @@ -46,7 +46,7 @@ IceInternal::TcpTransceiver::getAsyncInfo(SocketOperation status) #endif SocketOperation -IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer) +IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer, bool& hasMoreData) { try { @@ -93,7 +93,7 @@ IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer) // // Try to read the response. // - if(read(readBuffer)) + if(read(readBuffer, hasMoreData)) { // // Read completed without blocking - fall through. @@ -268,7 +268,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf) } bool -IceInternal::TcpTransceiver::read(Buffer& buf) +IceInternal::TcpTransceiver::read(Buffer& buf, bool&) { // // It's impossible for packetSize to be more than an Int. |