Mercurial > hg > icedtea12

changeset 2376:0f9261320112

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop patches/bytebuffer-compact.patch The patch only contained stylistic changes. The original bug addressed by the patch, 6593946: (bf) X-Buffer.compact() does not discard mark as specified, was fixed upstream a while back.
author Omair Majid <omajid@redhat.com>
date Thu, 21 Apr 2011 20:12:07 -0400
parents bf3fe6f6ddf4
children e53fc64228c1
files ChangeLog Makefile.am patches/icedtea-bytebuffer-compact.patch
diffstat 3 files changed, 6 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 21 13:20:10 2011 -0400
+++ b/ChangeLog	Thu Apr 21 20:12:07 2011 -0400
@@ -1,3 +1,9 @@
+2011-04-21  Omair Majid  <omajid@redhat.com>
+
+	* patches/bytebuffer-compact.patch: Drop patch. It only contained
+	stylistic changes.
+	* Makefile.am: Do not apply dropped patch.
+
 2011-04-21  Omair Majid  <omajid@redhat.com>
 
 	* patches/cacao/ignore-tests.patch: Update to apply on new sources.
--- a/Makefile.am	Thu Apr 21 13:20:10 2011 -0400
+++ b/Makefile.am	Thu Apr 21 20:12:07 2011 -0400
@@ -242,7 +242,6 @@
 	patches/hotspot/$(HSBUILD)/icedtea-headers.patch \
 	patches/icedtea-gcc-suffix.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \
-	patches/icedtea-bytebuffer-compact.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \
 	patches/icedtea-sunsrc.patch \
 	patches/icedtea-libraries.patch \
--- a/patches/icedtea-bytebuffer-compact.patch	Thu Apr 21 13:20:10 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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) discardMark();
-+	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) discardMark();
-+	return this;
-     }
- 
-     /**
-@@ -319,8 +319,8 @@
-     public final Buffer clear() {
-         position = 0;
-         limit = capacity;
--        mark = -1;
--        return this;
-+        discardMark();
-+	return this;
-     }
- 
-     /**
-@@ -347,7 +347,7 @@
-     public final Buffer flip() {
-         limit = position;
-         position = 0;
--        mark = -1;
-+        discardMark();
-         return this;
-     }
- 
-@@ -368,7 +368,7 @@
-      */
-     public final Buffer rewind() {
-         position = 0;
--        mark = -1;
-+        discardMark();
-         return this;
-     }
- 
-