summaryrefslogtreecommitdiffstats
path: root/io/source/connector
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-07-20 15:16:07 +0000
committerKurt Zenker <kz@openoffice.org>2006-07-20 15:16:07 +0000
commitfdb6a1b43653b083577c6b31993f813623f1b301 (patch)
treef4aeba4fdc289ff537038076d219f7bccc852526 /io/source/connector
parentINTEGRATION: CWS sb55 (1.22.30); FILE MERGED (diff)
downloadcore-fdb6a1b43653b083577c6b31993f813623f1b301.tar.gz
core-fdb6a1b43653b083577c6b31993f813623f1b301.zip
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/source/connector')
-rw-r--r--io/source/connector/ctr_socket.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index 7606b9686e81..b5757bf94db5 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();