From e175334c900392e2c65a5ce36dea8247f46f855f Mon Sep 17 00:00:00 2001 From: green Date: Wed, 28 Dec 2005 17:46:21 +0000 Subject: 2005-12-27 Tom Tromey * gnu/java/nio/SelectorImpl.java: Added import. 2005-12-26 Anthony Green * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109114 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/gnu/java/nio/SocketChannelImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libjava/classpath/gnu/java/nio/SocketChannelImpl.java') 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; -- cgit v1.2.1