diff options
| -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 ff10408..d873261 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 c4a54a9..48c7171 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; |