diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/io/natFileDescriptorWin32.cc | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ad23640..6df3cfa 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2002-03-09 Adam Megacz <adam@xwt.org> + * java/io/natFileDescriptorWin32.cc (read): Return -1 if zero + bytes read and no failure code returned. + +2002-03-09 Adam Megacz <adam@xwt.org> + * win32.cc (_CRT_MT, __mingwthr_key_dtor) Added fake definitions to simulate -mthreads. diff --git a/libjava/java/io/natFileDescriptorWin32.cc b/libjava/java/io/natFileDescriptorWin32.cc index 4a9d690..694272a 100644 --- a/libjava/java/io/natFileDescriptorWin32.cc +++ b/libjava/java/io/natFileDescriptorWin32.cc @@ -255,6 +255,7 @@ java::io::FileDescriptor::read(jbyteArray buffer, jint offset, jint count) if (! ReadFile((HANDLE)fd, bytes, count, &read, NULL)) throw new IOException (JvNewStringLatin1 (winerr ())); + if (read == 0) return -1; return (jint)read; } |