summaryrefslogtreecommitdiff
path: root/libjava/java/nio/channels/FileChannelImpl.java
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-12-19 19:06:34 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-12-19 19:06:34 +0000
commit26392535a78d2e396cff24391be6f4920c632e2b (patch)
tree54f8b26f344082df0e145f4f3cb044e281a93bf5 /libjava/java/nio/channels/FileChannelImpl.java
parentcc16f8b948be00bdbac8af00a388a25a53da901f (diff)
ChannelInputStream.java: New file.
2003-12-19 Michael Koch <konqueror@gmx.de> * gnu/java/nio/ChannelInputStream.java: New file. * java/nio/channels/Channels.java (newInputStream): Implemented. * java/nio/channels/FileChannelImpl.java (readImpl): Only put data into buffer if something was read. * Makefile.am (ordinary_java_source_files): Added gnu/java/nio/ChannelInputStream.java. * Makefile.in: Regenerated. From-SVN: r74842
Diffstat (limited to 'libjava/java/nio/channels/FileChannelImpl.java')
-rw-r--r--libjava/java/nio/channels/FileChannelImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/libjava/java/nio/channels/FileChannelImpl.java b/libjava/java/nio/channels/FileChannelImpl.java
index a14a7e1dd43..89ac11ad514 100644
--- a/libjava/java/nio/channels/FileChannelImpl.java
+++ b/libjava/java/nio/channels/FileChannelImpl.java
@@ -169,7 +169,9 @@ public class FileChannelImpl extends FileChannel
byte[] buffer = new byte [dst.remaining ()];
result = implRead (buffer, 0, buffer.length);
- dst.put (buffer, 0, result);
+
+ if (result > 0)
+ dst.put (buffer, 0, result);
return result;
}