diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-12-13 17:38:30 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-12-13 17:38:30 +0000 |
| commit | 74d13b59ce8a47e2948805136b463206c5ca4bdf (patch) | |
| tree | bf71d7865d1608f3f821ddd3e5c7cf66b81be5de /cppe/src | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=511 (diff) | |
| download | ice-74d13b59ce8a47e2948805136b463206c5ca4bdf.tar.bz2 ice-74d13b59ce8a47e2948805136b463206c5ca4bdf.tar.xz ice-74d13b59ce8a47e2948805136b463206c5ca4bdf.zip | |
Add timpit to blocking read
Diffstat (limited to 'cppe/src')
| -rwxr-xr-x | cppe/src/IceE/Connection.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp index ef329c27daa..a926dfe5fb1 100755 --- a/cppe/src/IceE/Connection.cpp +++ b/cppe/src/IceE/Connection.cpp @@ -1729,7 +1729,16 @@ Ice::Connection::readStream(IceInternal::BasicStream& stream) if(stream.i != stream.b.end()) { - _transceiver->read(stream, -1); + _transceiver->read(stream, +#ifdef ICEE_PURE_BLOCKING_CLIENT + _endpoint->timeout() +#else +# ifdef ICEE_BLOCKING_CLIENT + _blocking ? _endpoint->timeout() : +# endif + -1 +#endif + ); assert(stream.i == stream.b.end()); } } |