diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-11-22 20:32:56 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-11-22 20:32:56 +0000 |
| commit | 392cd098c5d7aa57b0a5ae934f8ee0ce9945130c (patch) | |
| tree | 6ff5a598076584ec2f8c14302e54297778e0a5bf | |
| parent | 23ba09f0705589532865015b6d03d7f8258a2c79 (diff) | |
| download | gcc-392cd098c5d7aa57b0a5ae934f8ee0ce9945130c.zip gcc-392cd098c5d7aa57b0a5ae934f8ee0ce9945130c.tar.gz gcc-392cd098c5d7aa57b0a5ae934f8ee0ce9945130c.tar.bz2 | |
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.
From-SVN: r91028
| -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 e3ae8ec..ef3e20a 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 23db892..ff4b63c 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(); |