PatchSet 5767 Date: 2005/01/05 19:45:25 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: nio fixes
Members: ChangeLog:1.3311->1.3312 libraries/javalib/java/nio/ByteBufferImpl.java:1.8->1.9 libraries/javalib/java/nio/CharBufferImpl.java:1.6->1.7 libraries/javalib/java/nio/DirectByteBufferImpl.java:1.10->1.11 libraries/javalib/java/nio/DoubleBufferImpl.java:1.6->1.7 libraries/javalib/java/nio/FloatBufferImpl.java:1.6->1.7 libraries/javalib/java/nio/IntBufferImpl.java:1.6->1.7 libraries/javalib/java/nio/LongBufferImpl.java:1.6->1.7 libraries/javalib/java/nio/MappedByteBufferImpl.java:1.9->1.10 libraries/javalib/java/nio/ShortBufferImpl.java:1.6->1.7 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3311 kaffe/ChangeLog:1.3312 --- kaffe/ChangeLog:1.3311 Wed Jan 5 19:40:41 2005 +++ kaffe/ChangeLog Wed Jan 5 19:45:25 2005 @@ -1,6 +1,23 @@ 2005-01-05 Dalibor Topic <[EMAIL PROTECTED]> Resynced with GNU Classpath. + + 2004-12-27 Jeroen Frijters <[EMAIL PROTECTED]> + + * java/nio/ByteBufferImpl.java, + java/nio/CharBufferImpl.java, + java/nio/DirectByteBufferImpl.java, + java/nio/DoubleBufferImpl.java, + java/nio/FloatBufferImpl.java, + java/nio/IntBufferImpl.java, + java/nio/LongBufferImpl.java, + java/nio/MappedByteBufferImpl.java, + java/nio/ShortBufferImpl.java + (compact): Added explicit read-only check and invalidate mark. + +2005-01-05 Dalibor Topic <[EMAIL PROTECTED]> + + Resynced with GNU Classpath. 2004-12-27 Michael Koch <[EMAIL PROTECTED]> Index: kaffe/libraries/javalib/java/nio/ByteBufferImpl.java diff -u kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.8 kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.9 --- kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.8 Tue Jun 15 17:39:09 2004 +++ kaffe/libraries/javalib/java/nio/ByteBufferImpl.java Wed Jan 5 19:45:27 2005 @@ -112,6 +112,8 @@ public ByteBuffer compact () { + checkIfReadOnly(); + mark = -1; int pos = position(); if (pos > 0) { Index: kaffe/libraries/javalib/java/nio/CharBufferImpl.java diff -u kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.6 kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.7 --- kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.6 Tue Jun 15 17:39:09 2004 +++ kaffe/libraries/javalib/java/nio/CharBufferImpl.java Wed Jan 5 19:45:27 2005 @@ -87,6 +87,8 @@ public CharBuffer compact () { + checkIfReadOnly(); + mark = -1; int copied = 0; while (remaining () > 0) Index: kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java diff -u kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.10 kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.11 --- kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.10 Wed Dec 1 02:42:11 2004 +++ kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java Wed Jan 5 19:45:27 2005 @@ -186,6 +186,8 @@ public ByteBuffer compact() { + checkIfReadOnly(); + mark = -1; int pos = position(); if (pos > 0) { Index: kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java diff -u kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java:1.6 kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java:1.7 --- kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java:1.6 Tue Jun 15 17:39:09 2004 +++ kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java Wed Jan 5 19:45:27 2005 @@ -80,6 +80,8 @@ public DoubleBuffer compact () { + checkIfReadOnly(); + mark = -1; int copied = 0; while (remaining () > 0) Index: kaffe/libraries/javalib/java/nio/FloatBufferImpl.java diff -u kaffe/libraries/javalib/java/nio/FloatBufferImpl.java:1.6 kaffe/libraries/javalib/java/nio/FloatBufferImpl.java:1.7 --- kaffe/libraries/javalib/java/nio/FloatBufferImpl.java:1.6 Tue Jun 15 17:39:09 2004 +++ kaffe/libraries/javalib/java/nio/FloatBufferImpl.java Wed Jan 5 19:45:27 2005 @@ -80,6 +80,8 @@ public FloatBuffer compact () { + checkIfReadOnly(); + mark = -1; int copied = 0; while (remaining () > 0) Index: kaffe/libraries/javalib/java/nio/IntBufferImpl.java diff -u kaffe/libraries/javalib/java/nio/IntBufferImpl.java:1.6 kaffe/libraries/javalib/java/nio/IntBufferImpl.java:1.7 --- kaffe/libraries/javalib/java/nio/IntBufferImpl.java:1.6 Tue Jun 15 17:39:09 2004 +++ kaffe/libraries/javalib/java/nio/IntBufferImpl.java Wed Jan 5 19:45:27 2005 @@ -80,6 +80,8 @@ public IntBuffer compact () { + checkIfReadOnly(); + mark = -1; int copied = 0; while (remaining () > 0) Index: kaffe/libraries/javalib/java/nio/LongBufferImpl.java diff -u kaffe/libraries/javalib/java/nio/LongBufferImpl.java:1.6 kaffe/libraries/javalib/java/nio/LongBufferImpl.java:1.7 --- kaffe/libraries/javalib/java/nio/LongBufferImpl.java:1.6 Tue Jun 15 17:39:09 2004 +++ kaffe/libraries/javalib/java/nio/LongBufferImpl.java Wed Jan 5 19:45:27 2005 @@ -80,6 +80,8 @@ public LongBuffer compact () { + checkIfReadOnly(); + mark = -1; int copied = 0; while (remaining () > 0) Index: kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java diff -u kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java:1.9 kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java:1.10 --- kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java:1.9 Wed Dec 1 02:42:11 2004 +++ kaffe/libraries/javalib/java/nio/MappedByteBufferImpl.java Wed Jan 5 19:45:27 2005 @@ -118,6 +118,8 @@ public ByteBuffer compact() { + checkIfReadOnly(); + mark = -1; int pos = position(); if (pos > 0) { Index: kaffe/libraries/javalib/java/nio/ShortBufferImpl.java diff -u kaffe/libraries/javalib/java/nio/ShortBufferImpl.java:1.6 kaffe/libraries/javalib/java/nio/ShortBufferImpl.java:1.7 --- kaffe/libraries/javalib/java/nio/ShortBufferImpl.java:1.6 Tue Jun 15 17:39:09 2004 +++ kaffe/libraries/javalib/java/nio/ShortBufferImpl.java Wed Jan 5 19:45:27 2005 @@ -80,6 +80,8 @@ public ShortBuffer compact () { + checkIfReadOnly(); + mark = -1; int copied = 0; while (remaining () > 0) _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe