diff options
| author | membar <membar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-14 17:15:18 +0000 |
|---|---|---|
| committer | membar <membar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-14 17:15:18 +0000 |
| commit | b20ccb645b0d0caff874378609de6b9fe4a6bad9 (patch) | |
| tree | 789215a717c8578a0e2c97a90bdb418dde8e0a18 | |
| parent | 6cdcb15c7213c1d61e32d75bf80f985b8171194b (diff) | |
| download | gcc-b20ccb645b0d0caff874378609de6b9fe4a6bad9.tar.gz | |
* 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
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplWin32.cc | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ff104084c23..d873261c4ea 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-11-14 Mohan Embar <gnustuff@thisiscool.com> + David Daney <ddaney@avtrex.com> + + * gnu/java/net/natPlainSocketImplWin32.cc: Updated copyright. + (read): Handle count == 0 case. + 2005-11-09 Tom Tromey <tromey@redhat.com> * 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 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; |