/hg/icedtea6: Revert previous commmit - it broke bootstrap.

[omajid at icedtea.classpath.org]

changeset bc0a045bf271 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bc0a045bf271
author: Omair Majid <omajid at redhat.com>
date: Fri Apr 22 17:35:11 2011 -0400

	Revert previous commmit - it broke bootstrap.


diffstat:

 ChangeLog                        |   6 +++
 Makefile.am                      |   1 +
 patches/bytebuffer-compact.patch |  61 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 0 deletions(-)

diffs (90 lines):

diff -r 92ce3a01d889 -r bc0a045bf271 ChangeLog
--- a/ChangeLog	Thu Apr 21 19:59:32 2011 -0400
+++ b/ChangeLog	Fri Apr 22 17:35:11 2011 -0400
@@ -1,3 +1,9 @@
+2011-04-22  Omair Majid  <omajid at redhat.com>
+
+	Revert previous patch.
+	* Makefile.am (ICEDTEA_PATCHES): Apply patch.
+	* patches/bytebuffer-compact.patch: Add back patch file.
+
 2011-04-21  Omair Majid  <omajid at redhat.com>
 
 	* patches/bytebuffer-compact.patch: Drop useless patch.
diff -r 92ce3a01d889 -r bc0a045bf271 Makefile.am
--- a/Makefile.am	Thu Apr 21 19:59:32 2011 -0400
+++ b/Makefile.am	Fri Apr 22 17:35:11 2011 -0400
@@ -224,6 +224,7 @@
 	patches/headers-hotspot.patch \
 	patches/gcc-suffix.patch \
 	patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
+	patches/bytebuffer-compact.patch \
 	patches/memory-limits.patch \
 	patches/libraries.patch \
 	patches/javafiles.patch \
diff -r 92ce3a01d889 -r bc0a045bf271 patches/bytebuffer-compact.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/bytebuffer-compact.patch	Fri Apr 22 17:35:11 2011 -0400
@@ -0,0 +1,62 @@
+--- ../openjdkb23/openjdk.old/jdk/src/share/classes/java/nio/Buffer.java	2007-10-30 04:36:08.000000000 -0400
++++ openjdk/jdk/src/share/classes/java/nio/Buffer.java	2007-11-13 13:33:28.000000000 -0500
+@@ -234,8 +234,8 @@
+         if ((newPosition > limit) || (newPosition < 0))
+             throw new IllegalArgumentException();
+         position = newPosition;
+-        if (mark > position) mark = -1;
+-        return this;
++        if (mark > position) clearMark();
++	return this;
+     }
+ 
+     /**
+@@ -266,8 +266,8 @@
+             throw new IllegalArgumentException();
+         limit = newLimit;
+         if (position > limit) position = limit;
+-        if (mark > limit) mark = -1;
+-        return this;
++        if (mark > position) clearMark();
++	return this;
+     }
+ 
+     /**
+@@ -319,8 +319,8 @@
+     public final Buffer clear() {
+         position = 0;
+         limit = capacity;
+-        mark = -1;
+-        return this;
++        clearMark();
++	return this;
+     }
+ 
+     /**
+@@ -347,7 +347,7 @@
+     public final Buffer flip() {
+         limit = position;
+         position = 0;
+-        mark = -1;
++        clearMark();
+         return this;
+     }
+ 
+@@ -368,7 +368,7 @@
+      */
+     public final Buffer rewind() {
+         position = 0;
+-        mark = -1;
++        clearMark();
+         return this;
+     }
+ 
+@@ -547,4 +547,8 @@
+             throw new IndexOutOfBoundsException();
+     }
+ 
++    final void clearMark() {                            // package-private
++        mark = -1;
++    }
++
+ }