changeset in /hg/icedtea: * patches/icedtea-bytebuffer-compact.p...

[Keith Seitz]

changeset 5578f6fee3c7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5578f6fee3c7
description:
	* patches/icedtea-bytebuffer-compact.patch: New file.
	        * Makefile.am (ICEDTEA_PATCHES): Add above patch.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 88 insertions(+)
ChangeLog                                |    6 ++
Makefile.am                              |    1 
patches/icedtea-bytebuffer-compact.patch |   81 ++++++++++++++++++++++++++++++

diffs (109 lines):

diff -r eceb31c1c47a -r 5578f6fee3c7 ChangeLog
--- a/ChangeLog	Wed Oct 03 15:38:04 2007 -0700
+++ b/ChangeLog	Wed Oct 03 15:44:35 2007 -0700
@@ -1,3 +1,9 @@ 2007-10-03  Keith Seitz  <keiths at redhat.
+2007-10-03  Keith Seitz  <keiths at redhat.com>
+
+	* patches/icedtea-bytebuffer-compact.patch: New file.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patch.
+	* Makefile.in: Regenerated.
+
 2007-10-03  Keith Seitz  <keiths at redhat.com>
 
 	* patches/icedtea-use-system-tzdata.patch: Use AccessController
diff -r eceb31c1c47a -r 5578f6fee3c7 Makefile.am
--- a/Makefile.am	Wed Oct 03 15:38:04 2007 -0700
+++ b/Makefile.am	Wed Oct 03 15:44:35 2007 -0700
@@ -143,6 +143,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-headers.patch \
 	patches/icedtea-ant.patch \
 	patches/icedtea-gcc-suffix.patch \
+	patches/icedtea-bytebuffer-compact.patch \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r eceb31c1c47a -r 5578f6fee3c7 patches/icedtea-bytebuffer-compact.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-bytebuffer-compact.patch	Wed Oct 03 15:44:35 2007 -0700
@@ -0,0 +1,81 @@
+diff -r 317d604b4da9 j2se/src/share/classes/java/nio/Buffer.java
+--- openjdk/j2se/src/share/classes/java/nio/Buffer.java	Tue Sep 25 12:45:52 2007 -0700
++++ openjdk/j2se/src/share/classes/java/nio/Buffer.java	Tue Sep 25 12:47:10 2007 -0700
+@@ -235,7 +235,7 @@ public abstract class Buffer {
+ 	if ((newPosition > limit) || (newPosition < 0))
+ 	    throw new IllegalArgumentException();
+ 	position = newPosition;
+-	if (mark > position) mark = -1;
++	if (mark > position) clearMark();
+ 	return this;
+     }
+ 
+@@ -267,7 +267,7 @@ public abstract class Buffer {
+ 	    throw new IllegalArgumentException();
+ 	limit = newLimit;
+ 	if (position > limit) position = limit;
+-	if (mark > limit) mark = -1;
++	if (mark > limit) clearMark();
+ 	return this;
+     }
+ 
+@@ -320,7 +320,7 @@ public abstract class Buffer {
+     public final Buffer clear() {
+ 	position = 0;
+ 	limit = capacity;
+-	mark = -1;
++	clearMark();
+ 	return this;
+     }
+ 
+@@ -348,7 +348,7 @@ public abstract class Buffer {
+     public final Buffer flip() {
+ 	limit = position;
+ 	position = 0;
+-	mark = -1;
++	clearMark();
+ 	return this;
+     }
+ 
+@@ -369,7 +369,7 @@ public abstract class Buffer {
+      */
+     public final Buffer rewind() {
+ 	position = 0;
+-	mark = -1;
++	clearMark();
+ 	return this;
+     }
+ 
+@@ -543,6 +543,10 @@ public abstract class Buffer {
+ 	return mark;
+     }
+ 
++    final void clearMark() {                            // package-private
++        mark = -1;
++    }
++
+     static void checkBounds(int off, int len, int size) { // package-private
+         if ((off | len | (off + len) | (size - (off + len))) < 0)
+ 	    throw new IndexOutOfBoundsException();
+diff -r 317d604b4da9 j2se/src/share/classes/java/nio/Direct-X-Buffer.java
+--- openjdk/j2se/src/share/classes/java/nio/Direct-X-Buffer.java	Tue Sep 25 12:45:52 2007 -0700
++++ openjdk/j2se/src/share/classes/java/nio/Direct-X-Buffer.java	Tue Sep 25 12:47:10 2007 -0700
+@@ -354,6 +354,7 @@ class Direct$Type$Buffer$RW$$BO$
+  	unsafe.copyMemory(ix(pos), ix(0), rem << $LG_BYTES_PER_VALUE$);
+  	position(rem);
+ 	limit(capacity());
++	clearMark();
+ 	return this;
+ #else[rw]
+ 	throw new ReadOnlyBufferException();
+diff -r 317d604b4da9 j2se/src/share/classes/java/nio/Heap-X-Buffer.java
+--- openjdk/j2se/src/share/classes/java/nio/Heap-X-Buffer.java	Tue Sep 25 12:45:52 2007 -0700
++++ openjdk/j2se/src/share/classes/java/nio/Heap-X-Buffer.java	Tue Sep 25 12:47:10 2007 -0700
+@@ -222,6 +222,7 @@ class Heap$Type$Buffer$RW$
+ 	System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
+ 	position(remaining());
+ 	limit(capacity());
++	clearMark();
+ 	return this;
+ #else[rw]
+ 	throw new ReadOnlyBufferException();