2005-01-07 Michael Koch <konqueror@gmx.de>

	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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@93046 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 38 insertions, 0 deletions

diff --git a/libjava/testsuite/libjava.jni/bytebuffer.java b/libjava/testsuite/libjava.jni/bytebuffer.java
new file mode 100644
index 00000000000..0e541123f55
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/bytebuffer.java
@@ -0,0 +1,38 @@
+// Test to make sure JNI implementation catches exceptions.
+
+import java.nio.*;
+
+public class bytebuffer
+{
+  static
+  {
+    System.loadLibrary("bytebuffer");
+  }
+
+  public static native void testByteBuffer(ByteBuffer bb);
+  public static native void testCharBuffer(CharBuffer b);
+  public static native void testDoubleBuffer(DoubleBuffer b);
+  public static native void testFloatBuffer(FloatBuffer b);
+  public static native void testIntBuffer(IntBuffer b);
+  public static native void testLongBuffer(LongBuffer b);
+  public static native void testShortBuffer(ShortBuffer b);
+
+  public static void main(String[] args)
+  {
+    ByteBuffer bb = ByteBuffer.allocate(1024);
+    testByteBuffer(bb);
+    testCharBuffer(bb.asCharBuffer());
+    testDoubleBuffer(bb.asDoubleBuffer());
+    testFloatBuffer(bb.asFloatBuffer());
+    testIntBuffer(bb.asIntBuffer());
+    testLongBuffer(bb.asLongBuffer());
+    testShortBuffer(bb.asShortBuffer());
+
+    testCharBuffer(CharBuffer.allocate(1024));
+    testDoubleBuffer(DoubleBuffer.allocate(1024));
+    testFloatBuffer(FloatBuffer.allocate(1024));
+    testIntBuffer(IntBuffer.allocate(1024));
+    testLongBuffer(LongBuffer.allocate(1024));
+    testShortBuffer(ShortBuffer.allocate(1024));
+  }
+}