diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-05-20 08:58:31 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-05-20 08:58:31 +0000 |
| commit | 3a5eb28322868f15d7daab0f97a5b6833632c854 (patch) | |
| tree | fbd6e2d67822568e3097d9f632bb4f24a53a3b95 /libjava/gnu/java/nio/SocketChannelImpl.java | |
| parent | 1db0418ae570eff510bb0c52cb5dbed54320d5a4 (diff) | |
ByteBufferImpl.java, [...]: Moved files to java/nio.
2003-05-20 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/ByteBufferImpl.java,
gnu/java/nio/CharBufferImpl.java,
gnu/java/nio/CharViewBufferImpl.java,
gnu/java/nio/DirectByteBufferImpl.java,
gnu/java/nio/DoubleBufferImpl.java,
gnu/java/nio/DoubleViewBufferImpl.java,
gnu/java/nio/FloatBufferImpl.java,
gnu/java/nio/FloatViewBufferImpl.java,
gnu/java/nio/IntBufferImpl.java,
gnu/java/nio/IntViewBufferImpl.java,
gnu/java/nio/LongBufferImpl.java,
gnu/java/nio/LongViewBufferImpl.java,
gnu/java/nio/natDirectByteBufferImpl.cc,
gnu/java/nio/ShortBufferImpl.java,
gnu/java/nio/ShortViewBufferImpl.java:
Moved files to java/nio.
* gnu/java/nio/SocketChannelImpl.java
* java/nio/ByteBuffer.java,
java/nio/CharBuffer.java,
java/nio/DoubleBuffer.java,
java/nio/FloatBuffer.java,
java/nio/IntBuffer.java,
java/nio/LongBuffer.java,
java/nio/ShortBuffer.java:
Dont import anything.
* java/nio/ByteBufferImpl.java,
java/nio/CharBufferImpl.java,
java/nio/CharViewBufferImpl.java,
java/nio/DirectByteBufferImpl.java,
java/nio/DoubleBufferImpl.java,
java/nio/DoubleViewBufferImpl.java,
java/nio/FloatBufferImpl.java,
java/nio/FloatViewBufferImpl.java,
java/nio/IntBufferImpl.java,
java/nio/IntViewBufferImpl.java,
java/nio/LongBufferImpl.java,
java/nio/LongViewBufferImpl.java,
java/nio/natDirectByteBufferImpl.cc,
java/nio/ShortBufferImpl.java,
java/nio/ShortViewBufferImpl.java:
Moved from gnu/java/nio.
* Makefile.am
(ordinary_java_source_files): Moved files from gnu/java/nio to
java/nio.
(nat_source_files): Moved natDirectByteBufferImpl.cc from gnu/java/nio
to java/nio.
* Makefile.in: Regenerated.
From-SVN: r66990
Diffstat (limited to 'libjava/gnu/java/nio/SocketChannelImpl.java')
| -rw-r--r-- | libjava/gnu/java/nio/SocketChannelImpl.java | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index 65ca62341ae..48cf585cb05 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -194,20 +194,19 @@ public class SocketChannelImpl extends SocketChannel int bytes = 0; int len = src.position(); - if (src instanceof ByteBufferImpl) - { - ByteBufferImpl bi = (ByteBufferImpl) src; - byte[]b = bi.array(); - bytes = SocketWrite(fd, b, 0, len); - } + if (src.hasArray ()) + { + byte[] b = src.array (); + bytes = SocketWrite (fd, b, 0, len); + } else - { - byte[]b = new byte[len]; - src.get(b, 0, len); - bytes = SocketWrite(fd, b, 0, len); - } + { + byte[] b = new byte [len]; + src.get (b, 0, len); + bytes = SocketWrite (fd, b, 0, len); + } - return bytes; + return bytes; } public long write (ByteBuffer[] srcs, int offset, int length) |