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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e3ae8ec75c5a7f7729b90954f17394088ae39e28..ef3e20a0cea7170c8302d8f7f4dfbc091045334f 100644 (file)
--- 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 23db8922687b4a80694264eff483116eafc71fa9..ff4b63c45e940a30ca123ac442408a0021b62bef 100644 (file)
--- 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();