From 2800f0cbc2e531ce45b9932e3c9cb580ba6c4a2b Mon Sep 17 00:00:00 2001 From: mkoch Date: Mon, 22 Nov 2004 20:32:56 +0000 Subject: 2004-11-22 Michael Koch * gnu/java/nio/SocketChannelImpl.java (read): Made check for blocking un-ambiguous. Removed wrong check for data array length. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91028 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/nio/SocketChannelImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libjava/gnu/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(); -- cgit v1.2.3