diff options
| author | Marc Laukien <marc@zeroc.com> | 2003-04-09 16:37:37 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2003-04-09 16:37:37 +0000 |
| commit | a8bd4340198433bc239495b91aa7f6080e0f5b46 (patch) | |
| tree | 8a4c7c5369561caa4913bad15024804c3a97c4a6 /cpp/src/Ice/Connection.cpp | |
| parent | Glacier request queue (diff) | |
| download | ice-a8bd4340198433bc239495b91aa7f6080e0f5b46.tar.bz2 ice-a8bd4340198433bc239495b91aa7f6080e0f5b46.tar.xz ice-a8bd4340198433bc239495b91aa7f6080e0f5b46.zip | |
fixes for RH9
Diffstat (limited to 'cpp/src/Ice/Connection.cpp')
| -rw-r--r-- | cpp/src/Ice/Connection.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp index c26a7258c03..4f88a116b28 100644 --- a/cpp/src/Ice/Connection.cpp +++ b/cpp/src/Ice/Connection.cpp @@ -105,10 +105,17 @@ IceInternal::Connection::waitUntilFinished() while(_transceiver || _dispatchCount > 0) { - if(timedWait(IceUtil::Time::milliSeconds(_endpoint->timeout()))) + if(_endpoint->timeout() >= 0) { - setState(StateClosed, CloseTimeoutException(__FILE__, __LINE__)); - // No return here, we must still wait until _transceiver becomes null. + if(!timedWait(IceUtil::Time::milliSeconds(_endpoint->timeout()))) + { + setState(StateClosed, CloseTimeoutException(__FILE__, __LINE__)); + // No return here, we must still wait until _transceiver becomes null. + } + } + else + { + wait(); } } |