OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes] 

2005-12-26  Anthony Green  <green@redhat.com>

	* gnu/java/nio/SocketChannelImpl.java (read): Compute the right amount
	of data to read (dst.remaining()).
	* gnu/java/nio/DatagramChannelImpl.java (receive): Ditto.

2005-11-11  Mark Wielaard  <mark@klomp.org>

	Reported by john.zigman@anu.edu.au as bug #24608.
	* gnu/java/nio/SocketChannelImpl.java (read): Put readBytes in
	destination ByteBuffer when it doesn't have an array instead of len
	bytes.

From-SVN: r109422
This commit is contained in:
Tom Tromey 2006-01-06 18:57:36 +00:00
parent 736432eedb
commit 8479d5f123
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libjava/ChangeLog
View File

@ -1,3 +1,16 @@
2005-12-26 Anthony Green <green@redhat.com>
* gnu/java/nio/SocketChannelImpl.java (read): Compute the right amount
of data to read (dst.remaining()).
* gnu/java/nio/DatagramChannelImpl.java (receive): Ditto.
2005-11-11 Mark Wielaard <mark@klomp.org>
Reported by john.zigman@anu.edu.au as bug #24608.
* gnu/java/nio/SocketChannelImpl.java (read): Put readBytes in
destination ByteBuffer when it doesn't have an array instead of len
bytes.
2006-01-05 Tom Tromey <tromey@redhat.com>
* java/lang/natThread.cc (finish_): Don't clear 'group'.

4
libjava/gnu/java/nio/DatagramChannelImpl.java
View File

@ -1,5 +1,5 @@
/* DatagramChannelImpl.java --
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -206,7 +206,7 @@ public final class DatagramChannelImpl extends DatagramChannel
try
{
DatagramPacket packet;
int len = dst.capacity() - dst.position();
int len = dst.remaining();
if (dst.hasArray())
{

6
libjava/gnu/java/nio/SocketChannelImpl.java
View File

@ -1,5 +1,5 @@
/* SocketChannelImpl.java --
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -225,7 +225,7 @@ public final class SocketChannelImpl extends SocketChannel
int offset = 0;
InputStream input = socket.getInputStream();
int available = input.available();
int len = dst.capacity() - dst.position();
int len = dst.remaining();
if ((! isBlocking()) && available == 0)
return 0;
@ -263,7 +263,7 @@ public final class SocketChannelImpl extends SocketChannel
}
else
{
dst.put (data, offset, len);
dst.put (data, offset, readBytes);
}
return readBytes;