/hg/icedtea7: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Feb 8 10:34:43 PST 2012
changeset 5d5cf3cb4d46 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=5d5cf3cb4d46
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 08 17:22:49 2012 +0000
Update to work with u2 updates.
2012-10-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am, (CORBA_CHANGESET): Updated.
(HOTSPOT_CHANGESET): Likewise. (JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET):
Likewise. (CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM):
Likewise.
* generated/java/nio/DirectByteBuffer.java,
* generated/java/nio/DirectByteBufferR.java,
* generated/java/nio/DirectCharBufferRS.java,
* generated/java/nio/DirectCharBufferRU.java,
* generated/java/nio/DirectCharBufferS.java,
* generated/java/nio/DirectCharBufferU.java,
* generated/java/nio/DirectDoubleBufferRS.java,
* generated/java/nio/DirectDoubleBufferRU.java,
* generated/java/nio/DirectDoubleBufferS.java,
* generated/java/nio/DirectDoubleBufferU.java,
* generated/java/nio/DirectFloatBufferRS.java,
* generated/java/nio/DirectFloatBufferRU.java,
* generated/java/nio/DirectFloatBufferS.java,
* generated/java/nio/DirectFloatBufferU.java,
* generated/java/nio/DirectIntBufferRS.java,
* generated/java/nio/DirectIntBufferRU.java,
* generated/java/nio/DirectIntBufferS.java,
* generated/java/nio/DirectIntBufferU.java,
* generated/java/nio/DirectLongBufferRS.java,
* generated/java/nio/DirectLongBufferRU.java,
* generated/java/nio/DirectLongBufferS.java,
* generated/java/nio/DirectLongBufferU.java,
* generated/java/nio/DirectShortBufferRS.java,
* generated/java/nio/DirectShortBufferRU.java,
* generated/java/nio/DirectShortBufferS.java,
* generated/java/nio/DirectShortBufferU.java: Use versions
from latest IcedTea7 forest build.
* generated/sun/nio/cs/ext/EUC_TWMapping.java: Added.
2011-01-15 Damien Raude-Morvan <drazzib at drazzib.com>
* patches/boot/ecj-diamond.patch,
* patches/boot/ecj-multicatch.patch,
* patches/boot/ecj-trywithresources.patch,
* patches/rhino.patch: Updated to apply against new checkout.
changeset ab2e1d6184e0 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ab2e1d6184e0
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 08 18:34:22 2012 +0000
Use 02 (for u2) as the update version.
2012-10-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Move JDK_UPDATE_VERSION and
COMBINED_VERSION to top of file with OPENJDK_VERSION.
(JDK_UPDATE_VERSION): Set to 02 for u2.
diffstat:
ChangeLog | 62 +
Makefile.am | 33 +-
generated/java/nio/DirectByteBuffer.java | 30 +-
generated/java/nio/DirectByteBufferR.java | 16 +-
generated/java/nio/DirectCharBufferRS.java | 45 +-
generated/java/nio/DirectCharBufferRU.java | 45 +-
generated/java/nio/DirectCharBufferS.java | 59 +-
generated/java/nio/DirectCharBufferU.java | 59 +-
generated/java/nio/DirectDoubleBufferRS.java | 35 +-
generated/java/nio/DirectDoubleBufferRU.java | 35 +-
generated/java/nio/DirectDoubleBufferS.java | 49 +-
generated/java/nio/DirectDoubleBufferU.java | 49 +-
generated/java/nio/DirectFloatBufferRS.java | 35 +-
generated/java/nio/DirectFloatBufferRU.java | 35 +-
generated/java/nio/DirectFloatBufferS.java | 49 +-
generated/java/nio/DirectFloatBufferU.java | 49 +-
generated/java/nio/DirectIntBufferRS.java | 35 +-
generated/java/nio/DirectIntBufferRU.java | 35 +-
generated/java/nio/DirectIntBufferS.java | 49 +-
generated/java/nio/DirectIntBufferU.java | 49 +-
generated/java/nio/DirectLongBufferRS.java | 35 +-
generated/java/nio/DirectLongBufferRU.java | 35 +-
generated/java/nio/DirectLongBufferS.java | 49 +-
generated/java/nio/DirectLongBufferU.java | 49 +-
generated/java/nio/DirectShortBufferRS.java | 35 +-
generated/java/nio/DirectShortBufferRU.java | 35 +-
generated/java/nio/DirectShortBufferS.java | 49 +-
generated/java/nio/DirectShortBufferU.java | 49 +-
generated/sun/nio/cs/ext/EUC_TWMapping.java | 10075 +++++++++++++++++++++++++
patches/boot/ecj-diamond.patch | 1889 ++--
patches/boot/ecj-multicatch.patch | 92 +-
patches/boot/ecj-trywithresources.patch | 348 +-
patches/rhino.patch | 76 +-
33 files changed, 12120 insertions(+), 1549 deletions(-)
diffs (truncated from 17137 to 500 lines):
diff -r 95c4bc033606 -r ab2e1d6184e0 ChangeLog
--- a/ChangeLog Thu Oct 27 15:57:25 2011 -0400
+++ b/ChangeLog Wed Feb 08 18:34:22 2012 +0000
@@ -1,3 +1,65 @@
+2012-10-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Move JDK_UPDATE_VERSION and COMBINED_VERSION
+ to top of file with OPENJDK_VERSION.
+ (JDK_UPDATE_VERSION): Set to 02 for u2.
+
+2012-10-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (CORBA_CHANGESET): Updated.
+ (HOTSPOT_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * generated/java/nio/DirectByteBuffer.java,
+ * generated/java/nio/DirectByteBufferR.java,
+ * generated/java/nio/DirectCharBufferRS.java,
+ * generated/java/nio/DirectCharBufferRU.java,
+ * generated/java/nio/DirectCharBufferS.java,
+ * generated/java/nio/DirectCharBufferU.java,
+ * generated/java/nio/DirectDoubleBufferRS.java,
+ * generated/java/nio/DirectDoubleBufferRU.java,
+ * generated/java/nio/DirectDoubleBufferS.java,
+ * generated/java/nio/DirectDoubleBufferU.java,
+ * generated/java/nio/DirectFloatBufferRS.java,
+ * generated/java/nio/DirectFloatBufferRU.java,
+ * generated/java/nio/DirectFloatBufferS.java,
+ * generated/java/nio/DirectFloatBufferU.java,
+ * generated/java/nio/DirectIntBufferRS.java,
+ * generated/java/nio/DirectIntBufferRU.java,
+ * generated/java/nio/DirectIntBufferS.java,
+ * generated/java/nio/DirectIntBufferU.java,
+ * generated/java/nio/DirectLongBufferRS.java,
+ * generated/java/nio/DirectLongBufferRU.java,
+ * generated/java/nio/DirectLongBufferS.java,
+ * generated/java/nio/DirectLongBufferU.java,
+ * generated/java/nio/DirectShortBufferRS.java,
+ * generated/java/nio/DirectShortBufferRU.java,
+ * generated/java/nio/DirectShortBufferS.java,
+ * generated/java/nio/DirectShortBufferU.java:
+ Use versions from latest IcedTea7 forest build.
+ * generated/sun/nio/cs/ext/EUC_TWMapping.java:
+ Added.
+
+2011-01-15 Damien Raude-Morvan <drazzib at drazzib.com>
+
+ * patches/boot/ecj-diamond.patch,
+ * patches/boot/ecj-multicatch.patch,
+ * patches/boot/ecj-trywithresources.patch,
+ * patches/rhino.patch:
+ Updated to apply against new checkout.
+
2011-10-27 Omair Majid <omajid at redhat.com>
* NEWS: Updated.
diff -r 95c4bc033606 -r ab2e1d6184e0 Makefile.am
--- a/Makefile.am Thu Oct 27 15:57:25 2011 -0400
+++ b/Makefile.am Wed Feb 08 18:34:22 2012 +0000
@@ -1,22 +1,24 @@
# Dependencies
OPENJDK_VERSION = b147
+JDK_UPDATE_VERSION = 02
+COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 4d9e4fb8af09
-HOTSPOT_CHANGESET = 018d705fd601
-JAXP_CHANGESET = 948e734135ea
-JAXWS_CHANGESET = a2ebfdc9db7e
-JDK_CHANGESET = 2054526dd141
-LANGTOOLS_CHANGESET = 9b85f1265346
-OPENJDK_CHANGESET = 0a76e5390e68
+CORBA_CHANGESET = 78cd4b4fcb75
+HOTSPOT_CHANGESET = 7bcec32b0c9a
+JAXP_CHANGESET = 7300d2ab9fb2
+JAXWS_CHANGESET = d26ff33070cb
+JDK_CHANGESET = 6ba07a297b14
+LANGTOOLS_CHANGESET = 1e3e0fc6b96a
+OPENJDK_CHANGESET = a66b58021165
-CORBA_SHA256SUM = 9579b9f47c45d4e6f4eb080a7a27886163691a77c193d83423389cb87656aec5
-HOTSPOT_SHA256SUM = 1954905ef693f358ada6bf40ec144fca324ad39798067c5b566cd396737671ed
-JAXP_SHA256SUM = 66948dee25e0224b12587ba150b21dab2e21b260a853bd1272e07c8d08d2e586
-JAXWS_SHA256SUM = 6edd17ac49c33a32538262486c0b8147954100cab43a6ee7023789f3840f22a8
-JDK_SHA256SUM = 4cd94391909ca86d2a5e25e3378c8fde1b1368076577fc58fed57097932750e1
-LANGTOOLS_SHA256SUM = 03a256afc7371b3b0fbbbfd80a318e22984f6cbff26082948e8d5845ba193aee
-OPENJDK_SHA256SUM = aa3b3cf17081cde2a4014e5dffec75f5b5402ad48f7f9943c32a2fa4544a8746
+CORBA_SHA256SUM = c25abc052d0e3041c558869ba88f80bf3ff051efbcd20e6c22b862fdd4c066d4
+HOTSPOT_SHA256SUM = dcd0fa5986cda4e691a8c4a3cfd81587248d51d4460b989c7ead0bb7a08f2674
+JAXP_SHA256SUM = 0774d2acaa47052b8f529edae1ca868721a0164a956455958a6ea51550fa01e0
+JAXWS_SHA256SUM = 5f0a98280219fa8fe2926cfd4471fb0e98391b38a3c4b29743ad361832cea0e2
+JDK_SHA256SUM = db85a3ce380b6a3f1ed60178112bcb308b6f5a37eaeaedc4534acfd50275d87c
+LANGTOOLS_SHA256SUM = fc893721f587ac47a24aeec4a41774efd9df7f43db9c76efc1a380b061b23ade
+OPENJDK_SHA256SUM = 714a000514e273bae755f4cc90df839a298583b38bb93518d6cf805dede99b6d
CACAO_VERSION = 4549072ab2de
CACAO_SHA256SUM = ec097ce96f047abbaeab4faab752c121d29f08bdeae358038a0b7cde03361d07
@@ -374,9 +376,6 @@
ICEDTEA_SHARK_BUILD = true
endif
-JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
-COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-
ICEDTEA_NAME = IcedTea7
if HAS_ICEDTEA_REVISION
ICEDTEA_REV = +${ICEDTEA_REVISION}
diff -r 95c4bc033606 -r ab2e1d6184e0 generated/java/nio/DirectByteBuffer.java
--- a/generated/java/nio/DirectByteBuffer.java Thu Oct 27 15:57:25 2011 -0400
+++ b/generated/java/nio/DirectByteBuffer.java Wed Feb 08 18:34:22 2012 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,12 +58,13 @@
// NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress
// protected long address;
- // If this buffer is a view of another buffer then we keep a reference to
- // that buffer so that its memory isn't freed before we're done with it
- protected Object viewedBuffer = null;
+ // An object attached to this buffer. If this buffer is a view of another
+ // buffer then we use this field to keep a reference to that buffer to
+ // ensure that its memory isn't freed before we are done with it.
+ private final Object att;
- public Object viewedBuffer() {
- return viewedBuffer;
+ public Object attachment() {
+ return att;
}
@@ -136,6 +137,7 @@
address = base;
}
cleaner = Cleaner.create(this, new Deallocator(base, size, cap));
+ att = null;
@@ -143,12 +145,24 @@
+ // Invoked to construct a direct ByteBuffer referring to the block of
+ // memory. A given arbitrary object may also be attached to the buffer.
+ //
+ DirectByteBuffer(long addr, int cap, Object ob) {
+ super(-1, 0, cap, cap);
+ address = addr;
+ cleaner = null;
+ att = ob;
+ }
+
+
// Invoked only by JNI: NewDirectByteBuffer(void*, long)
//
private DirectByteBuffer(long addr, int cap) {
super(-1, 0, cap, cap);
address = addr;
cleaner = null;
+ att = null;
}
@@ -162,8 +176,8 @@
super(-1, 0, cap, cap, fd);
address = addr;
- viewedBuffer = null;
cleaner = Cleaner.create(this, unmapper);
+ att = null;
@@ -180,10 +194,10 @@
super(mark, pos, lim, cap);
address = db.address() + off;
- viewedBuffer = db;
cleaner = null;
+ att = db;
diff -r 95c4bc033606 -r ab2e1d6184e0 generated/java/nio/DirectByteBufferR.java
--- a/generated/java/nio/DirectByteBufferR.java Thu Oct 27 15:57:25 2011 -0400
+++ b/generated/java/nio/DirectByteBufferR.java Wed Feb 08 18:34:22 2012 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -111,6 +111,7 @@
+
// Primary constructor
//
DirectByteBufferR(int cap) { // package-private
@@ -137,6 +138,7 @@
+
super(cap);
}
@@ -153,6 +155,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
// For memory-mapped buffers -- invoked by FileChannelImpl via reflection
//
protected DirectByteBufferR(int cap, long addr,
diff -r 95c4bc033606 -r ab2e1d6184e0 generated/java/nio/DirectCharBufferRS.java
--- a/generated/java/nio/DirectCharBufferRS.java Thu Oct 27 15:57:25 2011 -0400
+++ b/generated/java/nio/DirectCharBufferRS.java Wed Feb 08 18:34:22 2012 +0000
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,19 +18,20 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
// -- This file was mechanically generated: Do not edit! -- //
package java.nio;
+import java.io.FileDescriptor;
import sun.misc.Cleaner;
import sun.misc.Unsafe;
+import sun.misc.VM;
import sun.nio.ch.DirectBuffer;
-import sun.nio.ch.FileChannelImpl;
class DirectCharBufferRS
@@ -166,6 +167,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
// For duplicates and slices
//
DirectCharBufferRS(DirectBuffer db, // package-private
@@ -403,7 +422,7 @@
// --- Methods to support CharSequence ---
- public CharSequence subSequence(int start, int end) {
+ public CharBuffer subSequence(int start, int end) {
int pos = position();
int lim = limit();
assert (pos <= lim);
@@ -412,10 +431,12 @@
if ((start < 0) || (end > len) || (start > end))
throw new IndexOutOfBoundsException();
- int sublen = end - start;
- int off = (pos + start) << 1;
- assert (off >= 0);
- return new DirectCharBufferRS(this, -1, 0, sublen, sublen, off);
+ return new DirectCharBufferRS(this,
+ -1,
+ pos + start,
+ pos + end,
+ capacity(),
+ offset);
}
diff -r 95c4bc033606 -r ab2e1d6184e0 generated/java/nio/DirectCharBufferRU.java
--- a/generated/java/nio/DirectCharBufferRU.java Thu Oct 27 15:57:25 2011 -0400
+++ b/generated/java/nio/DirectCharBufferRU.java Wed Feb 08 18:34:22 2012 +0000
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,19 +18,20 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
// -- This file was mechanically generated: Do not edit! -- //
package java.nio;
+import java.io.FileDescriptor;
import sun.misc.Cleaner;
import sun.misc.Unsafe;
+import sun.misc.VM;
import sun.nio.ch.DirectBuffer;
-import sun.nio.ch.FileChannelImpl;
class DirectCharBufferRU
@@ -166,6 +167,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
// For duplicates and slices
//
DirectCharBufferRU(DirectBuffer db, // package-private
@@ -403,7 +422,7 @@
// --- Methods to support CharSequence ---
- public CharSequence subSequence(int start, int end) {
+ public CharBuffer subSequence(int start, int end) {
int pos = position();
int lim = limit();
assert (pos <= lim);
@@ -412,10 +431,12 @@
if ((start < 0) || (end > len) || (start > end))
throw new IndexOutOfBoundsException();
- int sublen = end - start;
- int off = (pos + start) << 1;
- assert (off >= 0);
- return new DirectCharBufferRU(this, -1, 0, sublen, sublen, off);
+ return new DirectCharBufferRU(this,
+ -1,
+ pos + start,
+ pos + end,
+ capacity(),
+ offset);
}
diff -r 95c4bc033606 -r ab2e1d6184e0 generated/java/nio/DirectCharBufferS.java
--- a/generated/java/nio/DirectCharBufferS.java Thu Oct 27 15:57:25 2011 -0400
+++ b/generated/java/nio/DirectCharBufferS.java Wed Feb 08 18:34:22 2012 +0000
@@ -1,12 +1,12 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,19 +18,20 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
// -- This file was mechanically generated: Do not edit! -- //
package java.nio;
+import java.io.FileDescriptor;
import sun.misc.Cleaner;
import sun.misc.Unsafe;
+import sun.misc.VM;
import sun.nio.ch.DirectBuffer;
-import sun.nio.ch.FileChannelImpl;
class DirectCharBufferS
@@ -57,12 +58,13 @@
// NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress
// protected long address;
- // If this buffer is a view of another buffer then we keep a reference to
- // that buffer so that its memory isn't freed before we're done with it
- protected Object viewedBuffer = null;
+ // An object attached to this buffer. If this buffer is a view of another
+ // buffer then we use this field to keep a reference to that buffer to
+ // ensure that its memory isn't freed before we are done with it.
+ private final Object att;
- public Object viewedBuffer() {
- return viewedBuffer;
+ public Object attachment() {
+ return att;
More information about the distro-pkg-dev
mailing list