RFC: drop bytebuffer-compact patch from icedtea6

[Dr Andrew John Hughes]

On 12:13 Thu 21 Apr     , Omair Majid wrote:
> On 04/21/2011 11:47 AM, Omair Majid wrote:
> > Hi,
> >
> > The bytebuffer-compact patch in icedtea6 was meant to address PR60. This
> > bug was fixed independently in openjdk6 as 6593946: (bf)
> > X-Buffer.compact() does not discard mark as specified. Since the fix was
> > applied upstream, the icedtea patch was modified so it did not conflict
> > with upstream.
> >
> > The openjdk6 fix introduces a new method discardMark() in
> > java.nio.Buffer, which is simply "mark = -1". The icedtea6 patch (as it
> > stands currently) introduces a new method clearMark() (in addition to
> > the discardMark() which is used elsewhere in the jdk) which does the
> > exact same thing, and then replaces all uses of "mark = -1" in
> > java.nio.Buffer class with clearMark(). IMHO, this patch is useless and
> > should be dropped.
> >
> > The IcedTea7 version of the patch can also be dropped, but at least that
> > just replaces "mark = -1" with discardMark() and does not introduce any
> > new methods.
> >
> > Any thoughts or concerns?
> >
> > ChangeLog
> > 2011-04-21 Omair Majid <omajid at redhat.com>
> >
> > * Makefile.am (ICEDTEA_PATCHES): Drop bytebuffer-compact.patch
> > * patches/bytebuffer-compact.patch: Remove useless patch.
> >
> 
> I didnt get this email back, so I suppose others might not have received 
> it either. Apologies if you have already seen it.
> 

No, this is the first time I saw this e-mail.

The patch was previously discussed here: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-April/005352.html

I'm for dumping it from both 6 and 7.

Please update http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches to say it has been dropped too.

We probably need to clone and edit that page for 7 too.  The 6 one also needs updating.

> Cheers,
> Omair

> diff -r 307d19e0cca0 Makefile.am
> --- a/Makefile.am	Tue Apr 12 15:56:56 2011 +0200
> +++ b/Makefile.am	Thu Apr 21 11:36:45 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 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;
> -+    }
> -+
> - }


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37