summaryrefslogtreecommitdiff
path: root/libjava/classpath/gnu/java/nio/SocketChannelImpl.java
diff options
context:
space:
mode:
authorgreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2005-12-28 17:46:21 +0000
committergreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2005-12-28 17:46:21 +0000
commite175334c900392e2c65a5ce36dea8247f46f855f (patch)
tree15dd1635f8c865e018064a4aa8d7cfaa79c78f5e /libjava/classpath/gnu/java/nio/SocketChannelImpl.java
parent328eb802880e7a7d81d9a413aa73a88f2b6eed60 (diff)
downloadgcc-e175334c900392e2c65a5ce36dea8247f46f855f.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109114 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/gnu/java/nio/SocketChannelImpl.java')
-rw-r--r--libjava/classpath/gnu/java/nio/SocketChannelImpl.java2
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;