diff options
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplPosix.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc index 46b56bb6efb..3f1dde9f5a2 100644 --- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004 Free Software Foundation +/* Copyright (C) 2003, 2004, 2005 Free Software Foundation This file is part of libgcj. @@ -405,6 +405,11 @@ gnu::java::net::PlainSocketImpl$SocketInputStream::read(jbyteArray buffer, jint static jint read_helper (jint native_fd, jint timeout, jbyte *bytes, jint count) { + // If zero bytes were requested, short circuit so that recv + // doesn't signal EOF. + if (count == 0) + return 0; + // Do timeouts via select. if (timeout > 0 && native_fd >= 0 && native_fd < FD_SETSIZE) { |
