diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2006-01-06 18:57:36 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-01-06 18:57:36 +0000 |
| commit | 8479d5f1230a6ac319939335c98988f13d5353d7 (patch) | |
| tree | 87fd654a61c05e7ac40de3f4c158485f9e106652 /libjava/gnu/java | |
| parent | 736432eedbab9ede68c755437ae8228a95e89871 (diff) | |
| download | gcc-8479d5f1230a6ac319939335c98988f13d5353d7.zip gcc-8479d5f1230a6ac319939335c98988f13d5353d7.tar.gz gcc-8479d5f1230a6ac319939335c98988f13d5353d7.tar.bz2 | |
[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
Diffstat (limited to 'libjava/gnu/java')
| -rw-r--r-- | libjava/gnu/java/nio/DatagramChannelImpl.java | 4 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/SocketChannelImpl.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libjava/gnu/java/nio/DatagramChannelImpl.java b/libjava/gnu/java/nio/DatagramChannelImpl.java index cb2a607..de1d2e6 100644 --- a/libjava/gnu/java/nio/DatagramChannelImpl.java +++ b/libjava/gnu/java/nio/DatagramChannelImpl.java @@ -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()) { diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index 8ca2b57..cda86e8 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -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; |