From d2ba8a75ef0a2bbc078df1a101235a05b6e70787 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 7 Jan 2005 11:32:07 +0000 Subject: re PR libgcj/18115 (JNI nio buffer functions only work with byte buffers) 2005-01-07 Michael Koch PR libgcj/18115 * java/nio/Buffer.java (address): New field. * java/nio/DirectByteBufferImpl.java (address): Removed. * java/nio/MappedByteBufferImpl.java (address): Likewise. * java/nio/CharViewBufferImpl.java (CharViewBufferImpl): Explicitly initialize Buffer.address if needed. * java/nio/DoubleViewBufferImpl.java (DoubleViewBufferImpl): Likewise. * java/nio/FloatViewBufferImpl.java (FloatViewBufferImpl): Likewise. * java/nio/IntViewBufferImpl.java (IntViewBufferImpl): Likewise. * java/nio/LongViewBufferImpl.java (LongViewBufferImpl): Likewise. * java/nio/ShortViewBufferImpl.java (ShortViewBufferImpl): Likewise. * jni.cc (_Jv_JNI_GetDirectBufferAddress): Don't assume buffer is a DirectByteBufferImpl object. (_Jv_JNI_GetDirectBufferCapacity): Likewise. * testsuite/libjava.jni/directbuffer.c, testsuite/libjava.jni/directbuffer.java, testsuite/libjava.jni/directbuffer.out, testsuite/libjava.jni/bytebuffer.c, testsuite/libjava.jni/bytebuffer.java, testsuite/libjava.jni/bytebuffer.out: New files. From-SVN: r93046 --- libjava/java/nio/FloatViewBufferImpl.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libjava/java/nio/FloatViewBufferImpl.java') diff --git a/libjava/java/nio/FloatViewBufferImpl.java b/libjava/java/nio/FloatViewBufferImpl.java index 40b7339..3dd0736 100644 --- a/libjava/java/nio/FloatViewBufferImpl.java +++ b/libjava/java/nio/FloatViewBufferImpl.java @@ -53,6 +53,8 @@ final class FloatViewBufferImpl extends FloatBuffer this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } public FloatViewBufferImpl (ByteBuffer bb, int offset, int capacity, @@ -64,6 +66,8 @@ final class FloatViewBufferImpl extends FloatBuffer this.offset = offset; this.readOnly = readOnly; this.endian = endian; + if (bb.isDirect()) + this.address = VMDirectByteBuffer.adjustAddress(bb.address, offset); } /** -- cgit v1.1