diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-11-21 20:19:59 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-11-21 20:19:59 +0000 |
| commit | 926253eecabc64f87a0c8601e7a3949dc56979c4 (patch) | |
| tree | 69ae908e3cfa7e43ca0339f19214f064e8560d43 /libjava/gnu | |
| parent | 7fe16580f0d58b8527f6bf078d5ba7279a2ddb45 (diff) | |
| download | gcc-926253eecabc64f87a0c8601e7a3949dc56979c4.zip gcc-926253eecabc64f87a0c8601e7a3949dc56979c4.tar.gz gcc-926253eecabc64f87a0c8601e7a3949dc56979c4.tar.bz2 | |
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.
From-SVN: r90986
Diffstat (limited to 'libjava/gnu')
| -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 c67b7cb..23db892 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) |