mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS bserver12 (1.13.8); FILE MERGED

Browse Source 
2006/01/16 15:09:34 kz 1.13.8.1: #130261# bug when reading/writing with timeout
This commit is contained in:
Oliver Bolte
2006-01-20 13:20:36 +00:00
parent 199f87358f
commit cebe0b2667
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vos/source/socket.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: socket.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: rt $ $Date: 2005-09-09 09:10:07 $
* last change: $Author: obo $ $Date: 2006-01-20 14:20:36 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1448,7 +1448,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;
}
@@ -1496,7 +1496,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;
}