aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-10-08 16:03:06 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-10-08 16:03:06 +0000
commit36805693cb85727570568498fef1714f802891ee (patch)
treee9202e03c3d881e1a39b1b8ca2dc650f09864158 /libjava
parentce7a72c80da847d7e279369082063db2b06641a0 (diff)
downloadgcc-36805693cb85727570568498fef1714f802891ee.zip
gcc-36805693cb85727570568498fef1714f802891ee.tar.gz
gcc-36805693cb85727570568498fef1714f802891ee.tar.bz2
2003-10-08 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/SocketChannelImpl.java (read): Write only read data to buffer. From-SVN: r72232
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/gnu/java/nio/SocketChannelImpl.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5950b35..11e83a4 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-08 Michael Koch <konqueror@gmx.de>
+
+ * gnu/java/nio/SocketChannelImpl.java
+ (read): Write only read data to buffer.
+
2003-10-08 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (setEnabled): Stub
diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java
index 589296f5..632d743 100644
--- a/libjava/gnu/java/nio/SocketChannelImpl.java
+++ b/libjava/gnu/java/nio/SocketChannelImpl.java
@@ -250,7 +250,7 @@ public final class SocketChannelImpl extends SocketChannel
if (readBytes > 0
&& !dst.hasArray())
{
- dst.put (data);
+ dst.put (data, offset, len);
}
return readBytes;