/hg/icedtea6: Drop bytebuffer-compact.patch; it serves no purpose
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Wed May 4 13:57:48 PDT 2011
changeset 2afcd8dd14a0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2afcd8dd14a0
author: Omair Majid <omajid at redhat.com>
date: Wed May 04 16:22:47 2011 -0400
Drop bytebuffer-compact.patch; it serves no purpose
2011-05-04 Omair Majid <omajid at redhat.com>
* Makefile.am (ICEDTEA_PATCHES): Drop bytebuffer-compact.patch.
The original issue this patch used to address was fixed
upstream. Now this patch just adds another method clearMark in
addition to upstream's discardMark.
* generated/java/nio/DirectByteBuffer.java,
* generated/java/nio/DirectCharBufferS.java,
* generated/java/nio/DirectCharBufferU.java,
* generated/java/nio/DirectDoubleBufferS.java,
* generated/java/nio/DirectDoubleBufferU.java,
* generated/java/nio/DirectFloatBufferS.java,
* generated/java/nio/DirectFloatBufferU.java,
* generated/java/nio/DirectIntBufferS.java,
* generated/java/nio/DirectIntBufferU.java,
* generated/java/nio/DirectLongBufferS.java,
* generated/java/nio/DirectLongBufferU.java,
* generated/java/nio/DirectShortBufferS.java,
* generated/java/nio/DirectShortBufferU.java,
* generated/java/nio/HeapByteBuffer.java,
* generated/java/nio/HeapCharBuffer.java,
* generated/java/nio/HeapDoubleBuffer.java,
* generated/java/nio/HeapFloatBuffer.java,
* generated/java/nio/HeapIntBuffer.java,
* generated/java/nio/HeapLongBuffer.java,
* generated/java/nio/HeapShortBuffer.java: Replace all uses of
clearMark with discardMark.
* patches/bytebuffer-compact.patch: Remove.
diffstat:
ChangeLog | 29 +++++++++++++
Makefile.am | 1 -
generated/java/nio/DirectByteBuffer.java | 2 +-
generated/java/nio/DirectCharBufferS.java | 2 +-
generated/java/nio/DirectCharBufferU.java | 2 +-
generated/java/nio/DirectDoubleBufferS.java | 2 +-
generated/java/nio/DirectDoubleBufferU.java | 2 +-
generated/java/nio/DirectFloatBufferS.java | 2 +-
generated/java/nio/DirectFloatBufferU.java | 2 +-
generated/java/nio/DirectIntBufferS.java | 2 +-
generated/java/nio/DirectIntBufferU.java | 2 +-
generated/java/nio/DirectLongBufferS.java | 2 +-
generated/java/nio/DirectLongBufferU.java | 2 +-
generated/java/nio/DirectShortBufferS.java | 2 +-
generated/java/nio/DirectShortBufferU.java | 2 +-
generated/java/nio/HeapByteBuffer.java | 2 +-
generated/java/nio/HeapCharBuffer.java | 2 +-
generated/java/nio/HeapDoubleBuffer.java | 2 +-
generated/java/nio/HeapFloatBuffer.java | 2 +-
generated/java/nio/HeapIntBuffer.java | 2 +-
generated/java/nio/HeapLongBuffer.java | 2 +-
generated/java/nio/HeapShortBuffer.java | 2 +-
patches/bytebuffer-compact.patch | 61 -----------------------------
23 files changed, 49 insertions(+), 82 deletions(-)
diffs (353 lines):
diff -r 45472ac9981b -r 2afcd8dd14a0 ChangeLog
--- a/ChangeLog Wed May 04 10:11:54 2011 -0400
+++ b/ChangeLog Wed May 04 16:22:47 2011 -0400
@@ -1,3 +1,32 @@
+2011-05-04 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am (ICEDTEA_PATCHES): Drop bytebuffer-compact.patch. The
+ original issue this patch used to address was fixed upstream. Now this
+ patch just adds another method clearMark in addition to upstream's
+ discardMark.
+ * generated/java/nio/DirectByteBuffer.java,
+ * generated/java/nio/DirectCharBufferS.java,
+ * generated/java/nio/DirectCharBufferU.java,
+ * generated/java/nio/DirectDoubleBufferS.java,
+ * generated/java/nio/DirectDoubleBufferU.java,
+ * generated/java/nio/DirectFloatBufferS.java,
+ * generated/java/nio/DirectFloatBufferU.java,
+ * generated/java/nio/DirectIntBufferS.java,
+ * generated/java/nio/DirectIntBufferU.java,
+ * generated/java/nio/DirectLongBufferS.java,
+ * generated/java/nio/DirectLongBufferU.java,
+ * generated/java/nio/DirectShortBufferS.java,
+ * generated/java/nio/DirectShortBufferU.java,
+ * generated/java/nio/HeapByteBuffer.java,
+ * generated/java/nio/HeapCharBuffer.java,
+ * generated/java/nio/HeapDoubleBuffer.java,
+ * generated/java/nio/HeapFloatBuffer.java,
+ * generated/java/nio/HeapIntBuffer.java,
+ * generated/java/nio/HeapLongBuffer.java,
+ * generated/java/nio/HeapShortBuffer.java: Replace all uses of clearMark
+ with discardMark.
+ * patches/bytebuffer-compact.patch: Remove.
+
2011-05-04 Omair Majid <omajid at redhat.com>
* patches/nss-debug.patch: Remove file. It was upstreamed and was not
diff -r 45472ac9981b -r 2afcd8dd14a0 Makefile.am
--- a/Makefile.am Wed May 04 10:11:54 2011 -0400
+++ b/Makefile.am Wed May 04 16:22:47 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 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectByteBuffer.java
--- a/generated/java/nio/DirectByteBuffer.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectByteBuffer.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 0);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectCharBufferS.java
--- a/generated/java/nio/DirectCharBufferS.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectCharBufferS.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 1);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectCharBufferU.java
--- a/generated/java/nio/DirectCharBufferU.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectCharBufferU.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 1);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectDoubleBufferS.java
--- a/generated/java/nio/DirectDoubleBufferS.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectDoubleBufferS.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 3);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectDoubleBufferU.java
--- a/generated/java/nio/DirectDoubleBufferU.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectDoubleBufferU.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 3);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectFloatBufferS.java
--- a/generated/java/nio/DirectFloatBufferS.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectFloatBufferS.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 2);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectFloatBufferU.java
--- a/generated/java/nio/DirectFloatBufferU.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectFloatBufferU.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 2);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectIntBufferS.java
--- a/generated/java/nio/DirectIntBufferS.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectIntBufferS.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 2);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectIntBufferU.java
--- a/generated/java/nio/DirectIntBufferU.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectIntBufferU.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 2);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectLongBufferS.java
--- a/generated/java/nio/DirectLongBufferS.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectLongBufferS.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 3);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectLongBufferU.java
--- a/generated/java/nio/DirectLongBufferU.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectLongBufferU.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 3);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectShortBufferS.java
--- a/generated/java/nio/DirectShortBufferS.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectShortBufferS.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 1);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectShortBufferU.java
--- a/generated/java/nio/DirectShortBufferU.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/DirectShortBufferU.java Wed May 04 16:22:47 2011 -0400
@@ -354,7 +354,7 @@
unsafe.copyMemory(ix(pos), ix(0), rem << 1);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapByteBuffer.java
--- a/generated/java/nio/HeapByteBuffer.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/HeapByteBuffer.java Wed May 04 16:22:47 2011 -0400
@@ -222,7 +222,7 @@
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapCharBuffer.java
--- a/generated/java/nio/HeapCharBuffer.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/HeapCharBuffer.java Wed May 04 16:22:47 2011 -0400
@@ -222,7 +222,7 @@
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapDoubleBuffer.java
--- a/generated/java/nio/HeapDoubleBuffer.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/HeapDoubleBuffer.java Wed May 04 16:22:47 2011 -0400
@@ -222,7 +222,7 @@
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapFloatBuffer.java
--- a/generated/java/nio/HeapFloatBuffer.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/HeapFloatBuffer.java Wed May 04 16:22:47 2011 -0400
@@ -222,7 +222,7 @@
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapIntBuffer.java
--- a/generated/java/nio/HeapIntBuffer.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/HeapIntBuffer.java Wed May 04 16:22:47 2011 -0400
@@ -222,7 +222,7 @@
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapLongBuffer.java
--- a/generated/java/nio/HeapLongBuffer.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/HeapLongBuffer.java Wed May 04 16:22:47 2011 -0400
@@ -222,7 +222,7 @@
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapShortBuffer.java
--- a/generated/java/nio/HeapShortBuffer.java Wed May 04 10:11:54 2011 -0400
+++ b/generated/java/nio/HeapShortBuffer.java Wed May 04 16:22:47 2011 -0400
@@ -222,7 +222,7 @@
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r 45472ac9981b -r 2afcd8dd14a0 patches/bytebuffer-compact.patch
--- a/patches/bytebuffer-compact.patch Wed May 04 10:11:54 2011 -0400
+++ /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;
-+ }
-+
- }
More information about the distro-pkg-dev
mailing list