From 99b8b611f5aa76e6231b2938d05f29fdf5a74073 Mon Sep 17 00:00:00 2001 From: Mohan Embar Date: Mon, 14 Nov 2005 17:15:18 +0000 Subject: [PATCH] natPlainSocketImplWin32.cc: Updated copyright. * gnu/java/net/natPlainSocketImplWin32.cc: Updated copyright. (read): Handle count == 0 case. Co-Authored-By: David Daney From-SVN: r106894 --- libjava/ChangeLog | 6 ++++++ libjava/gnu/java/net/natPlainSocketImplWin32.cc | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ff104084c233..d873261c4ea5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-11-14 Mohan Embar + David Daney + + * gnu/java/net/natPlainSocketImplWin32.cc: Updated copyright. + (read): Handle count == 0 case. + 2005-11-09 Tom Tromey * testsuite/libjava.jacks/jacks.xfail (non-jls-zip-2): Now diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc index c4a54a90c3a1..48c7171c7c19 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; -- 2.47.3