From 175b9fb81320997ddb52d1d353ea74127d023288 Mon Sep 17 00:00:00 2001 From: mkoch Date: Sun, 21 Nov 2004 20:19:59 +0000 Subject: 2004-11-21 Michael Koch * gnu/java/nio/SocketChannelImpl.java (read): Only return 0 when no bytes for reading available in non-blocking mode. * java/nio/channels/SocketChannel.java: Added some missing @return tags. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90986 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/nio/SocketChannelImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/gnu') diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index c67b7cb7bb7..23db8922687 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -182,7 +182,7 @@ public final class SocketChannelImpl extends SocketChannel // FIXME: Handle blocking/non-blocking mode. Selector selector = provider().openSelector(); - register (selector, SelectionKey.OP_CONNECT); + register(selector, SelectionKey.OP_CONNECT); if (isBlocking()) { @@ -216,7 +216,7 @@ public final class SocketChannelImpl extends SocketChannel return socket; } - public int read (ByteBuffer dst) throws IOException + public int read(ByteBuffer dst) throws IOException { if (!isConnected()) throw new NotYetConnectedException(); @@ -227,7 +227,7 @@ public final class SocketChannelImpl extends SocketChannel int available = input.available(); int len = dst.capacity() - dst.position(); - if (available == 0) + if (! isBlocking() && available == 0) return 0; if (len > available) -- cgit v1.2.3