diff options
| author | Anthony Green <green@gcc.gnu.org> | 2005-12-28 17:46:21 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2005-12-28 17:46:21 +0000 |
| commit | 5c3bb9eb9ed5f92b376c048460d515416fad962b (patch) | |
| tree | 15dd1635f8c865e018064a4aa8d7cfaa79c78f5e /libjava/classpath/gnu/java/nio/SocketChannelImpl.java | |
| parent | 3779973b0b163d0323aa679f9ec81c8caae5c427 (diff) | |
[multiple changes]
2005-12-27 Tom Tromey <tromey@redhat.com>
* gnu/java/nio/SelectorImpl.java: Added import.
2005-12-26 Anthony Green <green@redhat.com>
* java/net/Socket.java (connect): Don't close the socket on
exceptions.
* gnu/java/nio/SocketChannelImpl.java (read): Compute the right amount
of data to read (dst.remaining()).
* gnu/java/nio/DatagramChannelImpl.java (receive): Ditto.
* gnu/java/nio/SelectorImpl.java (select): Handle OP_CONNECT
properly.
From-SVN: r109114
Diffstat (limited to 'libjava/classpath/gnu/java/nio/SocketChannelImpl.java')
| -rw-r--r-- | libjava/classpath/gnu/java/nio/SocketChannelImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libjava/classpath/gnu/java/nio/SocketChannelImpl.java b/libjava/classpath/gnu/java/nio/SocketChannelImpl.java index fcddbd6c351..680eba2f92b 100644 --- a/libjava/classpath/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/classpath/gnu/java/nio/SocketChannelImpl.java @@ -220,7 +220,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; |