/hg/icedtea6: Drop bytebuffer-compact.patch

[omajid at icedtea.classpath.org]

changeset 92ce3a01d889 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=92ce3a01d889
author: Omair Majid <omajid at redhat.com>
date: Thu Apr 21 19:59:32 2011 -0400

	Drop bytebuffer-compact.patch

	The bytebuffer-compact patch adds a (package-private) method
	clearMark to reset the mark. Upstream already addressed this
	problem: 6593946: (bf) X-Buffer.compact() does not discard mark as
	specified. The upstream fix adds a method discardMark(), and updates
	the rest of the JDK to use that method. The clearMark() method added
	by this patch is not used anywhere and can be dropped safely.


diffstat:

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

diffs (89 lines):

diff -r 307d19e0cca0 -r 92ce3a01d889 ChangeLog
--- a/ChangeLog	Tue Apr 12 15:56:56 2011 +0200
+++ b/ChangeLog	Thu Apr 21 19:59:32 2011 -0400
@@ -1,3 +1,8 @@
+2011-04-21  Omair Majid  <omajid at redhat.com>
+
+	* patches/bytebuffer-compact.patch: Drop useless patch.
+	* Makefile.am (ICEDTEA_PATCHES): Do not apply dropped patch.
+
 2011-04-12  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	PR689: Shark fails to find LLVM 2.9 System headers during build
diff -r 307d19e0cca0 -r 92ce3a01d889 Makefile.am
--- a/Makefile.am	Tue Apr 12 15:56:56 2011 +0200
+++ b/Makefile.am	Thu Apr 21 19:59:32 2011 -0400
@@ -224,7 +224,6 @@
 	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 307d19e0cca0 -r 92ce3a01d889 patches/bytebuffer-compact.patch
--- a/patches/bytebuffer-compact.patch	Tue Apr 12 15:56:56 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
---- ../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;
-+    }
-+
- }