summaryrefslogtreecommitdiff
path: root/vos
diff options
context:
space:
mode:
authorGregor Hartmann <gh@openoffice.org>2001-07-24 10:54:55 +0000
committerGregor Hartmann <gh@openoffice.org>2001-07-24 10:54:55 +0000
commit2b85c47f417659a0014eb6c6490dfcff305d1f3c (patch)
tree9af2d7d506e758eaaa50768e5054493ca501aa8b /vos
parentec27866250ab3dc1540177c292e4dfa6cc084429 (diff)
bug when reading/writing with timeout
Diffstat (limited to 'vos')
-rw-r--r--vos/source/socket.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/vos/source/socket.cxx b/vos/source/socket.cxx
index a1ca84be03a7..1a239de1eb03 100644
--- a/vos/source/socket.cxx
+++ b/vos/source/socket.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: socket.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: jbu $ $Date: 2001-04-27 10:46:21 $
+ * last change: $Author: gh $ $Date: 2001-07-24 11:54:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1474,7 +1474,7 @@ sal_Int32 OStreamSocket::read(void* pBuffer, sal_uInt32 n) const
Ptr += RetVal;
/* wait for next available data or timeout */
- if (m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout))
+ if ( BytesToRead > 0 && m_pRecvTimeout && ! isRecvReady(m_pRecvTimeout))
break;
}
@@ -1522,7 +1522,7 @@ sal_Int32 OStreamSocket::write(const void* pBuffer, sal_uInt32 n)
Ptr += RetVal;
/* wait till new data is available or timeout occures */
- if (m_pSendTimeout && ! isSendReady(m_pSendTimeout))
+ if ( BytesToSend > 0 && m_pSendTimeout && ! isSendReady(m_pSendTimeout))
break;
}