From b20ccb645b0d0caff874378609de6b9fe4a6bad9 Mon Sep 17 00:00:00 2001 From: membar Date: Mon, 14 Nov 2005 17:15:18 +0000 Subject: * gnu/java/net/natPlainSocketImplWin32.cc: Updated copyright. (read): Handle count == 0 case. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@106894 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/net/natPlainSocketImplWin32.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libjava/gnu/java/net') diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc index c4a54a90c3a..48c7171c7c1 100644 --- a/libjava/gnu/java/net/natPlainSocketImplWin32.cc +++ b/libjava/gnu/java/net/natPlainSocketImplWin32.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation +/* Copyright (C) 2003, 2004, 2005 Free Software Foundation This file is part of libgcj. @@ -491,6 +491,11 @@ jint gnu::java::net::PlainSocketImpl$SocketInputStream::read(jbyteArray buffer, jint offset, jint count) { + // If zero bytes were requested, short circuit so that recv + // doesn't signal EOF. + if (count == 0) + return 0; + if (! buffer) throw new ::java::lang::NullPointerException; -- cgit v1.2.3