diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/SocketChannelImpl.java | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e3ae8ec75c5..ef3e20a0cea 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2004-11-22 Michael Koch <konqueror@gmx.de> + + * gnu/java/nio/SocketChannelImpl.java + (read): Made check for blocking un-ambiguous. + Removed wrong check for data array length. + 2004-11-21 Michael Koch <konqueror@gmx.de> * gnu/java/nio/SocketChannelImpl.java diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index 23db8922687..ff4b63c45e9 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -227,12 +227,9 @@ public final class SocketChannelImpl extends SocketChannel int available = input.available(); int len = dst.capacity() - dst.position(); - if (! isBlocking() && available == 0) + if ((! isBlocking()) && available == 0) return 0; - if (len > available) - len = available; - if (dst.hasArray()) { offset = dst.arrayOffset() + dst.position(); |