diff options
| -rw-r--r-- | libjava/ChangeLog | 10 | ||||
| -rw-r--r-- | libjava/Makefile.am | 1 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/ChannelInputStream.java | 79 | ||||
| -rw-r--r-- | libjava/java/nio/channels/Channels.java | 5 | ||||
| -rw-r--r-- | libjava/java/nio/channels/FileChannelImpl.java | 4 |
6 files changed, 98 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c2d017b..8db6d73 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,15 @@ 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. + +2003-12-19 Michael Koch <konqueror@gmx.de> + * gnu/java/nio/OutputStreamChannel.java: New file. * java/nio/channels/Channels.java (newChannel): Implemented. * Makefile.am (ordinary_java_source_files): diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 9156010..acd6f2a 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -2224,6 +2224,7 @@ gnu/java/nio/NIOConstants.java \ gnu/java/nio/NIODatagramSocket.java \ gnu/java/nio/NIOServerSocket.java \ gnu/java/nio/NIOSocket.java \ +gnu/java/nio/ChannelInputStream.java \ gnu/java/nio/InputStreamChannel.java \ gnu/java/nio/OutputStreamChannel.java \ gnu/java/nio/PipeImpl.java \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 4f9b040..522cbcb 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1931,6 +1931,7 @@ gnu/java/nio/NIOConstants.java \ gnu/java/nio/NIODatagramSocket.java \ gnu/java/nio/NIOServerSocket.java \ gnu/java/nio/NIOSocket.java \ +gnu/java/nio/ChannelInputStream.java \ gnu/java/nio/InputStreamChannel.java \ gnu/java/nio/OutputStreamChannel.java \ gnu/java/nio/PipeImpl.java \ @@ -3064,6 +3065,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/net/protocol/http/Handler.P \ .deps/gnu/java/net/protocol/jar/Connection.P \ .deps/gnu/java/net/protocol/jar/Handler.P \ +.deps/gnu/java/nio/ChannelInputStream.P \ .deps/gnu/java/nio/DatagramChannelImpl.P \ .deps/gnu/java/nio/DatagramChannelSelectionKey.P \ .deps/gnu/java/nio/FileLockImpl.P \ diff --git a/libjava/gnu/java/nio/ChannelInputStream.java b/libjava/gnu/java/nio/ChannelInputStream.java new file mode 100644 index 0000000..4cf4875 --- /dev/null +++ b/libjava/gnu/java/nio/ChannelInputStream.java @@ -0,0 +1,79 @@ +/* ChannelInputStream.java -- + Copyright (C) 2003 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package gnu.java.nio; + +import java.io.InputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.IllegalBlockingModeException; +import java.nio.channels.ReadableByteChannel; +import java.nio.channels.SelectableChannel; + +/** + * @author Michael Koch + */ +public final class ChannelInputStream extends InputStream +{ + private ReadableByteChannel ch; + + public ChannelInputStream (ReadableByteChannel ch) + { + super(); + + this.ch = ch; + } + + public int read() throws IOException + { + if (ch instanceof SelectableChannel + && (! ((SelectableChannel) ch).isBlocking())) + throw new IllegalBlockingModeException(); + + ByteBuffer buffer = ByteBuffer.allocate(1); + int result = ch.read(buffer); + + if (result == -1) + return -1; + + if (result == 0) + throw new IOException("Could not read from channel"); + + return buffer.get(0); + } +} diff --git a/libjava/java/nio/channels/Channels.java b/libjava/java/nio/channels/Channels.java index f8358ae..d70410c 100644 --- a/libjava/java/nio/channels/Channels.java +++ b/libjava/java/nio/channels/Channels.java @@ -37,6 +37,7 @@ exception statement from your version. */ package java.nio.channels; +import gnu.java.nio.ChannelInputStream; import gnu.java.nio.InputStreamChannel; import gnu.java.nio.OutputStreamChannel; import java.io.InputStream; @@ -55,9 +56,9 @@ public final class Channels /** * Constructs a stream that reads bytes from the given channel. */ - public static InputStream newInputStream (ReadableByteChannel ch) + public static InputStream newInputStream(ReadableByteChannel ch) { - throw new Error ("not implemented"); + return new ChannelInputStream(ch); } /** diff --git a/libjava/java/nio/channels/FileChannelImpl.java b/libjava/java/nio/channels/FileChannelImpl.java index a14a7e1..89ac11a 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; } |