diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-12-13 13:34:49 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-12-13 13:34:49 +0000 |
| commit | 0a6a05db87d193a9a8e09783b6c14fbab360ac28 (patch) | |
| tree | 2ac6e31526efffc286b9a32efdd8f5a719a23bda /cppe/src/IceE/Connection.cpp | |
| parent | Added support for setting replica groups. (diff) | |
| download | ice-0a6a05db87d193a9a8e09783b6c14fbab360ac28.tar.bz2 ice-0a6a05db87d193a9a8e09783b6c14fbab360ac28.tar.xz ice-0a6a05db87d193a9a8e09783b6c14fbab360ac28.zip | |
Added timeout to blocking read Removed ConnectionTimeoutException
Diffstat (limited to 'cppe/src/IceE/Connection.cpp')
| -rwxr-xr-x | cppe/src/IceE/Connection.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp index a4c7db3e694..f6df199a2c3 100755 --- a/cppe/src/IceE/Connection.cpp +++ b/cppe/src/IceE/Connection.cpp @@ -1182,7 +1182,6 @@ Ice::Connection::setState(State state, const LocalException& ex) // if(!(dynamic_cast<const CloseConnectionException*>(_exception.get()) || dynamic_cast<const ForcedCloseConnectionException*>(_exception.get()) || - dynamic_cast<const ConnectionTimeoutException*>(_exception.get()) || dynamic_cast<const CommunicatorDestroyedException*>(_exception.get()) || #ifndef ICEE_PURE_CLIENT dynamic_cast<const ObjectAdapterDeactivatedException*>(_exception.get()) || @@ -1654,7 +1653,16 @@ Ice::Connection::readStream(IceInternal::BasicStream& stream) { stream.b.resize(headerSize); stream.i = stream.b.begin(); - _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 + ); ptrdiff_t pos = stream.i - stream.b.begin(); assert(pos >= headerSize); |