diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-19 19:06:34 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-19 19:06:34 +0000 |
| commit | 265702db433a2157ff433d3062b8065d07e29b2f (patch) | |
| tree | 54f8b26f344082df0e145f4f3cb044e281a93bf5 /libjava/java/nio/channels/FileChannelImpl.java | |
| parent | 1ef3ba97de893cf53bea1f86a31f2182841ab10f (diff) | |
| download | ppe42-gcc-265702db433a2157ff433d3062b8065d07e29b2f.tar.gz ppe42-gcc-265702db433a2157ff433d3062b8065d07e29b2f.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74842 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/nio/channels/FileChannelImpl.java')
| -rw-r--r-- | libjava/java/nio/channels/FileChannelImpl.java | 4 |
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; } |
