diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-21 20:19:59 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-21 20:19:59 +0000 |
| commit | 175b9fb81320997ddb52d1d353ea74127d023288 (patch) | |
| tree | 69ae908e3cfa7e43ca0339f19214f064e8560d43 /libjava/gnu/java/nio/SocketChannelImpl.java | |
| parent | 35cd87c410b0046a2516d4e4d4574f1a83166af7 (diff) | |
| download | ppe42-gcc-175b9fb81320997ddb52d1d353ea74127d023288.tar.gz ppe42-gcc-175b9fb81320997ddb52d1d353ea74127d023288.zip | |
2004-11-21 Michael Koch <konqueror@gmx.de>
* 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
Diffstat (limited to 'libjava/gnu/java/nio/SocketChannelImpl.java')
| -rw-r--r-- | libjava/gnu/java/nio/SocketChannelImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
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) |
