diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-20 15:16:07 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-20 15:16:07 +0000 |
| commit | 0b1a391d1d69a563ac412bb335223f5cb6d17cde (patch) | |
| tree | 53ef8278c1972e96a59f4105feca6aede4aed30d /io | |
| parent | 31a4ad74c4db981a3ebfff2c98925e2ad2d9e6a8 (diff) | |
INTEGRATION: CWS sb55 (1.9.4); FILE MERGED
2006/07/13 09:14:12 sb 1.9.4.1: #i46752# When reading from the socket, do not treat EOF as an error.
Diffstat (limited to 'io')
| -rw-r--r-- | io/source/connector/ctr_socket.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx index 8564d3d83..1d3cf5a70 100644 --- a/io/source/connector/ctr_socket.cxx +++ b/io/source/connector/ctr_socket.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ctr_socket.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2006-06-20 00:17:15 $ + * last change: $Author: kz $ $Date: 2006-07-20 16:16:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -147,7 +147,7 @@ namespace stoc_connector { } sal_Int32 i = m_socket.read( aReadBytes.getArray() , aReadBytes.getLength() ); - if(i != nBytesToRead) + if(i != nBytesToRead && m_socket.getError() != osl_Socket_E_None) { OUString message(RTL_CONSTASCII_USTRINGPARAM("ctr_socket.cxx:SocketConnection::read: error - ")); message += m_socket.getErrorAsString(); |