Mercurial > hg > release > icedtea6-1.13
changeset 3231:6ddafe528889
Update to build against October 2015 security fixes.
2015-10-27 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(OPENJDK_DATE): Bump to b37 creation date;
27th of October, 2015.
(OPENJDK_SHA256SUM): Update for b37 tarball.
2015-10-26 Andrew John Hughes <gnu.andrew@redhat.com>
* NEWS: Updated.
* generated/java/nio/BufferOverflowException.java,
* generated/java/nio/BufferUnderflowException.java,
* generated/java/nio/ByteBuffer.java,
* generated/java/nio/ByteBufferAsCharBufferB.java,
* generated/java/nio/ByteBufferAsCharBufferL.java,
* generated/java/nio/ByteBufferAsCharBufferRB.java,
* generated/java/nio/ByteBufferAsCharBufferRL.java,
* generated/java/nio/ByteBufferAsDoubleBufferB.java,
* generated/java/nio/ByteBufferAsDoubleBufferL.java,
* generated/java/nio/ByteBufferAsDoubleBufferRB.java,
* generated/java/nio/ByteBufferAsDoubleBufferRL.java,
* generated/java/nio/ByteBufferAsFloatBufferB.java,
* generated/java/nio/ByteBufferAsFloatBufferL.java,
* generated/java/nio/ByteBufferAsFloatBufferRB.java,
* generated/java/nio/ByteBufferAsFloatBufferRL.java,
* generated/java/nio/ByteBufferAsIntBufferB.java,
* generated/java/nio/ByteBufferAsIntBufferL.java,
* generated/java/nio/ByteBufferAsIntBufferRB.java,
* generated/java/nio/ByteBufferAsIntBufferRL.java,
* generated/java/nio/ByteBufferAsLongBufferB.java,
* generated/java/nio/ByteBufferAsLongBufferL.java,
* generated/java/nio/ByteBufferAsLongBufferRB.java,
* generated/java/nio/ByteBufferAsLongBufferRL.java,
* generated/java/nio/ByteBufferAsShortBufferB.java,
* generated/java/nio/ByteBufferAsShortBufferL.java,
* generated/java/nio/ByteBufferAsShortBufferRB.java,
* generated/java/nio/ByteBufferAsShortBufferRL.java,
* generated/java/nio/CharBuffer.java,
* 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,
* generated/java/nio/DoubleBuffer.java,
* generated/java/nio/FloatBuffer.java,
* generated/java/nio/HeapByteBuffer.java,
* generated/java/nio/HeapByteBufferR.java,
* generated/java/nio/HeapCharBuffer.java,
* generated/java/nio/HeapCharBufferR.java,
* generated/java/nio/HeapDoubleBuffer.java,
* generated/java/nio/HeapDoubleBufferR.java,
* generated/java/nio/HeapFloatBuffer.java,
* generated/java/nio/HeapFloatBufferR.java,
* generated/java/nio/HeapIntBuffer.java,
* generated/java/nio/HeapIntBufferR.java,
* generated/java/nio/HeapLongBuffer.java,
* generated/java/nio/HeapLongBufferR.java,
* generated/java/nio/HeapShortBuffer.java,
* generated/java/nio/HeapShortBufferR.java,
* generated/java/nio/IntBuffer.java,
* generated/java/nio/InvalidMarkException.java,
* generated/java/nio/LongBuffer.java,
* generated/java/nio/ReadOnlyBufferException.java,
* generated/java/nio/ShortBuffer.java,
* generated/java/nio/channels/AlreadyConnectedException.java,
* generated/java/nio/channels/AsynchronousCloseException.java,
* generated/java/nio/channels/CancelledKeyException.java,
* generated/java/nio/channels/ClosedByInterruptException.java,
* generated/java/nio/channels/ClosedChannelException.java,
* generated/java/nio/channels/ClosedSelectorException.java,
* generated/java/nio/channels/ConnectionPendingException.java,
* generated/java/nio/channels/FileLockInterruptionException.java,
* generated/java/nio/channels/IllegalBlockingModeException.java,
* generated/java/nio/channels/IllegalSelectorException.java,
* generated/java/nio/channels/NoConnectionPendingException.java,
* generated/java/nio/channels/NonReadableChannelException.java,
* generated/java/nio/channels/NonWritableChannelException.java,
* generated/java/nio/channels/NotYetBoundException.java,
* generated/java/nio/channels/NotYetConnectedException.java,
* generated/java/nio/channels/OverlappingFileLockException.java,
* generated/java/nio/channels/UnresolvedAddressException.java,
* generated/java/nio/channels/UnsupportedAddressTypeException.java,
* generated/java/nio/charset/CharacterCodingException.java,
* generated/java/nio/charset/CharsetDecoder.java,
* generated/java/nio/charset/CharsetEncoder.java,
* generated/java/nio/charset/IllegalCharsetNameException.java,
* generated/java/nio/charset/UnsupportedCharsetException.java:
Replaced by versions from a build of OpenJDK 6 b37.
* patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch:
Regenerated.
* patches/version.patch:
Fix path from Version-template.java to Version.java.template,
following 6888701 upstream.
line wrap: on
line diff
--- a/ChangeLog Tue Aug 18 23:08:20 2015 +0100 +++ b/ChangeLog Tue Oct 27 16:35:07 2015 +0000 @@ -1,3 +1,118 @@ +2015-10-27 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (OPENJDK_DATE): Bump to b37 creation date; + 27th of October, 2015. + (OPENJDK_SHA256SUM): Update for b37 tarball. + +2015-10-26 Andrew John Hughes <gnu.andrew@redhat.com> + + * NEWS: Updated. + * generated/java/nio/BufferOverflowException.java, + * generated/java/nio/BufferUnderflowException.java, + * generated/java/nio/ByteBuffer.java, + * generated/java/nio/ByteBufferAsCharBufferB.java, + * generated/java/nio/ByteBufferAsCharBufferL.java, + * generated/java/nio/ByteBufferAsCharBufferRB.java, + * generated/java/nio/ByteBufferAsCharBufferRL.java, + * generated/java/nio/ByteBufferAsDoubleBufferB.java, + * generated/java/nio/ByteBufferAsDoubleBufferL.java, + * generated/java/nio/ByteBufferAsDoubleBufferRB.java, + * generated/java/nio/ByteBufferAsDoubleBufferRL.java, + * generated/java/nio/ByteBufferAsFloatBufferB.java, + * generated/java/nio/ByteBufferAsFloatBufferL.java, + * generated/java/nio/ByteBufferAsFloatBufferRB.java, + * generated/java/nio/ByteBufferAsFloatBufferRL.java, + * generated/java/nio/ByteBufferAsIntBufferB.java, + * generated/java/nio/ByteBufferAsIntBufferL.java, + * generated/java/nio/ByteBufferAsIntBufferRB.java, + * generated/java/nio/ByteBufferAsIntBufferRL.java, + * generated/java/nio/ByteBufferAsLongBufferB.java, + * generated/java/nio/ByteBufferAsLongBufferL.java, + * generated/java/nio/ByteBufferAsLongBufferRB.java, + * generated/java/nio/ByteBufferAsLongBufferRL.java, + * generated/java/nio/ByteBufferAsShortBufferB.java, + * generated/java/nio/ByteBufferAsShortBufferL.java, + * generated/java/nio/ByteBufferAsShortBufferRB.java, + * generated/java/nio/ByteBufferAsShortBufferRL.java, + * generated/java/nio/CharBuffer.java, + * 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, + * generated/java/nio/DoubleBuffer.java, + * generated/java/nio/FloatBuffer.java, + * generated/java/nio/HeapByteBuffer.java, + * generated/java/nio/HeapByteBufferR.java, + * generated/java/nio/HeapCharBuffer.java, + * generated/java/nio/HeapCharBufferR.java, + * generated/java/nio/HeapDoubleBuffer.java, + * generated/java/nio/HeapDoubleBufferR.java, + * generated/java/nio/HeapFloatBuffer.java, + * generated/java/nio/HeapFloatBufferR.java, + * generated/java/nio/HeapIntBuffer.java, + * generated/java/nio/HeapIntBufferR.java, + * generated/java/nio/HeapLongBuffer.java, + * generated/java/nio/HeapLongBufferR.java, + * generated/java/nio/HeapShortBuffer.java, + * generated/java/nio/HeapShortBufferR.java, + * generated/java/nio/IntBuffer.java, + * generated/java/nio/InvalidMarkException.java, + * generated/java/nio/LongBuffer.java, + * generated/java/nio/ReadOnlyBufferException.java, + * generated/java/nio/ShortBuffer.java, + * generated/java/nio/channels/AlreadyConnectedException.java, + * generated/java/nio/channels/AsynchronousCloseException.java, + * generated/java/nio/channels/CancelledKeyException.java, + * generated/java/nio/channels/ClosedByInterruptException.java, + * generated/java/nio/channels/ClosedChannelException.java, + * generated/java/nio/channels/ClosedSelectorException.java, + * generated/java/nio/channels/ConnectionPendingException.java, + * generated/java/nio/channels/FileLockInterruptionException.java, + * generated/java/nio/channels/IllegalBlockingModeException.java, + * generated/java/nio/channels/IllegalSelectorException.java, + * generated/java/nio/channels/NoConnectionPendingException.java, + * generated/java/nio/channels/NonReadableChannelException.java, + * generated/java/nio/channels/NonWritableChannelException.java, + * generated/java/nio/channels/NotYetBoundException.java, + * generated/java/nio/channels/NotYetConnectedException.java, + * generated/java/nio/channels/OverlappingFileLockException.java, + * generated/java/nio/channels/UnresolvedAddressException.java, + * generated/java/nio/channels/UnsupportedAddressTypeException.java, + * generated/java/nio/charset/CharacterCodingException.java, + * generated/java/nio/charset/CharsetDecoder.java, + * generated/java/nio/charset/CharsetEncoder.java, + * generated/java/nio/charset/IllegalCharsetNameException.java, + * generated/java/nio/charset/UnsupportedCharsetException.java: + Replaced by versions from a build of OpenJDK 6 b37. + * patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch: + Regenerated. + * patches/version.patch: + Fix path from Version-template.java to Version.java.template, + following 6888701 upstream. + 2015-08-18 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/Makefile.am Tue Aug 18 23:08:20 2015 +0100 +++ b/Makefile.am Tue Oct 27 16:35:07 2015 +0000 @@ -1,7 +1,7 @@ # Dependencies -OPENJDK_DATE = 22_jul_2015 -OPENJDK_SHA256SUM = c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 +OPENJDK_DATE = 27_oct_2015 +OPENJDK_SHA256SUM = 8f11d396fff111b090a1c8abad6d96936e9851e734f1ffd1ccb2ea63a800564f OPENJDK_VERSION = b37 OPENJDK_URL = https://java.net/downloads/openjdk6/
--- a/NEWS Tue Aug 18 23:08:20 2015 +0100 +++ b/NEWS Tue Oct 27 16:35:07 2015 +0000 @@ -14,6 +14,85 @@ New in release 1.13.9 (2015-10-XX): +* Security fixes + - S8048030, CVE-2015-4734: Expectations should be consistent + - S8068842, CVE-2015-4803: Better JAXP data handling + - S8076339, CVE-2015-4903: Better handling of remote object invocation + - S8076383, CVE-2015-4835: Better CORBA exception handling + - S8076387, CVE-2015-4882: Better CORBA value handling + - S8076392, CVE-2015-4881: Improve IIOPInputStream consistency + - S8076413, CVE-2015-4883: Better JRMP message handling + - S8078427, CVE-2015-4842: More supportive home environment + - S8078440: Safer managed types + - S8080541: More direct property handling + - S8080688, CVE-2015-4860: Service for DGC services + - S8081760: Better group dynamics + - S8086733, CVE-2015-4893: Improve namespace handling + - S8087350: Improve array conversions + - S8103671, CVE-2015-4805: More objective stream classes + - S8103675: Better Binary searches + - S8130078, CVE-2015-4911: Document better processing + - S8130193, CVE-2015-4806: Improve HTTP connections + - S8130864: Better server identity handling + - S8130891, CVE-2015-4843: (bf) More direct buffering + - S8131291, CVE-2015-4872: Perfect parameter patterning + - S8132042, CVE-2015-4844: Preserve layout presentation +* Import of OpenJDK6 b37 + - OJ64: Backport hashtable to map changes from jaxp + - OJ65: Remove @Override annotation on interfaces added by 2015/10/20 security fixes + - S6570619: (bf) DirectByteBuffer.get/put(byte[]) does not scale well + - S6590930: reed/write does not match for ccache + - S6648972: KDCReq.init always read padata + - S6676075: RegistryContext (com.sun.jndi.url.rmi.rmiURLContext) coding problem + - S6682516: SPNEGO_HTTP_AUTH/WWW_KRB and SPNEGO_HTTP_AUTH/WWW_SPNEGO failed on all non-windows platforms + - S6710360: export Kerberos session key to applications + - S6785456: Read Kerberos setting from Windows environment variables + - S6843127: krb5 should not try to access unavailable kdc too often + - S6844193: support max_retries in krb5.conf + - S6844907: krb5 etype order should be from strong to weak + - S6844909: support allow_weak_crypto in krb5.conf + - S6849275: enhance krb5 reg tests + - S6853328: Support OK-AS-DELEGATE flag + - S6854308: more ktab options + - S6856069: PrincipalName.clone() does not invoke super.clone() + - S6857795: krb5.conf ignored if system properties on realm and kdc are provided + - S6858589: more changes to Config on system properties + - S6862679: ESC: AD Authentication with user with umlauts fails + - S6877357: IPv6 address does not work + - S6888701: Change all template java source files to a .java-template file suffix + - S6893158: AP_REQ check should use key version number + - S6932525: Incorrect encryption types of KDC_REQ_BODY of AS-REQ with pre-authentication + - S6946669: SSL/Krb5 should not call EncryptedData.reset(data, false) + - S6950546: "ktab -d name etype" to "ktab -d name [-e etype] [kvno | all | old]" + - S6951366: kerberos login failure on win2008 with AD set to win2000 compat mode + - S6952519: kdc_timeout is not being honoured when using TCP + - S6959292: regression: cannot login if session key and preauth does not use the same etype + - S6960894: Better AS-REQ creation and processing + - S6966259: Make PrincipalName and Realm immutable + - S6984764: kerberos fails if service side keytab is generated using JDK ktab + - S7032354: no-addresses should not be used on acceptor side + - S7061379: [Kerberos] Cross-realm authentication fails, due to nameType problem + - S7142596: RMI JPRT tests are failing + - S7157610: NullPointerException occurs when parsing XML doc + - S7158329: NPE in sun.security.krb5.Credentials.acquireDefaultCreds() + - S8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported + - S8005226: java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java fails intermittently + - S8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times + - S8014097: add doPrivileged methods with limited privilege scope + - S8021191: Add isAuthorized check to limited doPrivileged methods + - S8022213: Intermittent test failures in java/net/URLClassLoader + - S8028583: Add helper methods to test libraries + - S8028780: JDK KRB5 module throws OutOfMemoryError when CCache is corrupt + - S8058608: JVM crash during Kerberos logins using des3-cbc-md5 on OSX + - S8064331: JavaSecurityAccess.doIntersectionPrivilege() drops the information about the domain combiner of the stack ACC + - S8072932: Test fails with java.security.AccessControlException: access denied ("java.security.SecurityPermission" "getDomainCombiner") + - S8078822: 8068842 fix missed one new file PrimeNumberSequenceGenerator.java + - S8079323: Serialization compatibility for Templates: need to exclude Hashtable from serialization + - S8087118: Remove missing package from java.security files + - S8098547: (tz) Support tzdata2015e + - S8130253: ObjectStreamClass.getFields too restrictive + - S8133321: (tz) Support tzdata2015f + - S8135043: ObjectStreamClass.getField(String) too restrictive * Backports - S6440786, PR363: Cannot create a ZIP file containing zero entries - S6599383, PR363: Unable to open zip files more than 2GB in size
--- a/generated/java/nio/BufferOverflowException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/BufferOverflowException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/BufferUnderflowException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/BufferUnderflowException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/ByteBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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,9 +18,9 @@ * 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! -- // @@ -1059,7 +1059,7 @@ - + /** * Returns the current hash code of this buffer.
--- a/generated/java/nio/ByteBufferAsCharBufferB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsCharBufferB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsCharBufferL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsCharBufferL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsCharBufferRB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsCharBufferRB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsCharBufferRL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsCharBufferRL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsDoubleBufferB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsDoubleBufferB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsDoubleBufferL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsDoubleBufferL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsDoubleBufferRB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsDoubleBufferRB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsDoubleBufferRL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsDoubleBufferRL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsFloatBufferB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsFloatBufferB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsFloatBufferL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsFloatBufferL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsFloatBufferRB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsFloatBufferRB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsFloatBufferRL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsFloatBufferRL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsIntBufferB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsIntBufferB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsIntBufferL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsIntBufferL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsIntBufferRB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsIntBufferRB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsIntBufferRL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsIntBufferRL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsLongBufferB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsLongBufferB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsLongBufferL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsLongBufferL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsLongBufferRB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsLongBufferRB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsLongBufferRL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsLongBufferRL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsShortBufferB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsShortBufferB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsShortBufferL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsShortBufferL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -150,6 +150,7 @@ sb.compact(); position(rem); limit(capacity()); + discardMark(); return this;
--- a/generated/java/nio/ByteBufferAsShortBufferRB.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsShortBufferRB.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/ByteBufferAsShortBufferRL.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ByteBufferAsShortBufferRL.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2004, 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,9 +18,9 @@ * 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! -- // @@ -152,6 +152,7 @@ + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/CharBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/CharBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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,9 +18,9 @@ * 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! -- // @@ -1059,7 +1059,7 @@ - + /** * Returns the current hash code of this buffer.
--- a/generated/java/nio/DirectByteBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectByteBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(byte[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 0); + return address + ((long)i << 0); } public byte get() { @@ -229,7 +232,7 @@ public ByteBuffer get(byte[] dst, int offset, int length) { - if ((length << 0) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 0) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); - if (order() != ByteOrder.nativeOrder()) - Bits.copyToByteArray(ix(pos), dst, - offset << 0, - length << 0); - else - Bits.copyToByteArray(ix(pos), dst, - offset << 0, - length << 0); + + + + + + + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 0, + (long)length << 0); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 0); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 0); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public ByteBuffer put(byte[] src, int offset, int length) { - if ((length << 0) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 0) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); - if (order() != ByteOrder.nativeOrder()) - Bits.copyFromByteArray(src, offset << 0, - ix(pos), length << 0); - else - Bits.copyFromByteArray(src, offset << 0, - ix(pos), length << 0); + + + + + + + + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 0, + ix(pos), + (long)length << 0); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 0); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 0); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectByteBufferR.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectByteBufferR.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -105,6 +105,9 @@ + + + // Primary constructor // DirectByteBufferR(int cap) { // package-private @@ -258,6 +261,8 @@ + + public ByteBuffer put(byte x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectCharBufferRS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectCharBufferRS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectCharBufferRS(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public CharBuffer put(char x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectCharBufferRU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectCharBufferRU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectCharBufferRU(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public CharBuffer put(char x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectCharBufferS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectCharBufferS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(char[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 1); + return address + ((long)i << 1); } public char get() { @@ -229,7 +232,7 @@ public CharBuffer get(char[] dst, int offset, int length) { - if ((length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToCharArray(ix(pos), dst, - offset << 1, - length << 1); + (long)offset << 1, + (long)length << 1); else - Bits.copyToByteArray(ix(pos), dst, - offset << 1, - length << 1); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 1, + (long)length << 1); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 1); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 1); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public CharBuffer put(char[] src, int offset, int length) { - if ((length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromCharArray(src, offset << 1, - ix(pos), length << 1); + Bits.copyFromCharArray(src, + (long)offset << 1, + ix(pos), + (long)length << 1); else - Bits.copyFromByteArray(src, offset << 1, - ix(pos), length << 1); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 1, + ix(pos), + (long)length << 1); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 1); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 1); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectCharBufferU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectCharBufferU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(char[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 1); + return address + ((long)i << 1); } public char get() { @@ -229,7 +232,7 @@ public CharBuffer get(char[] dst, int offset, int length) { - if ((length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToCharArray(ix(pos), dst, - offset << 1, - length << 1); + (long)offset << 1, + (long)length << 1); else - Bits.copyToByteArray(ix(pos), dst, - offset << 1, - length << 1); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 1, + (long)length << 1); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 1); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 1); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public CharBuffer put(char[] src, int offset, int length) { - if ((length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromCharArray(src, offset << 1, - ix(pos), length << 1); + Bits.copyFromCharArray(src, + (long)offset << 1, + ix(pos), + (long)length << 1); else - Bits.copyFromByteArray(src, offset << 1, - ix(pos), length << 1); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 1, + ix(pos), + (long)length << 1); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 1); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 1); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectDoubleBufferRS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectDoubleBufferRS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectDoubleBufferRS(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public DoubleBuffer put(double x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectDoubleBufferRU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectDoubleBufferRU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectDoubleBufferRU(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public DoubleBuffer put(double x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectDoubleBufferS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectDoubleBufferS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(double[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 3); + return address + ((long)i << 3); } public double get() { @@ -229,7 +232,7 @@ public DoubleBuffer get(double[] dst, int offset, int length) { - if ((length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToLongArray(ix(pos), dst, - offset << 3, - length << 3); + (long)offset << 3, + (long)length << 3); else - Bits.copyToByteArray(ix(pos), dst, - offset << 3, - length << 3); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 3, + (long)length << 3); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 3); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 3); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public DoubleBuffer put(double[] src, int offset, int length) { - if ((length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromLongArray(src, offset << 3, - ix(pos), length << 3); + Bits.copyFromLongArray(src, + (long)offset << 3, + ix(pos), + (long)length << 3); else - Bits.copyFromByteArray(src, offset << 3, - ix(pos), length << 3); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 3, + ix(pos), + (long)length << 3); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 3); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 3); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectDoubleBufferU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectDoubleBufferU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(double[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 3); + return address + ((long)i << 3); } public double get() { @@ -229,7 +232,7 @@ public DoubleBuffer get(double[] dst, int offset, int length) { - if ((length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToLongArray(ix(pos), dst, - offset << 3, - length << 3); + (long)offset << 3, + (long)length << 3); else - Bits.copyToByteArray(ix(pos), dst, - offset << 3, - length << 3); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 3, + (long)length << 3); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 3); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 3); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public DoubleBuffer put(double[] src, int offset, int length) { - if ((length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromLongArray(src, offset << 3, - ix(pos), length << 3); + Bits.copyFromLongArray(src, + (long)offset << 3, + ix(pos), + (long)length << 3); else - Bits.copyFromByteArray(src, offset << 3, - ix(pos), length << 3); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 3, + ix(pos), + (long)length << 3); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 3); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 3); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectFloatBufferRS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectFloatBufferRS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectFloatBufferRS(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public FloatBuffer put(float x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectFloatBufferRU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectFloatBufferRU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectFloatBufferRU(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public FloatBuffer put(float x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectFloatBufferS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectFloatBufferS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(float[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 2); + return address + ((long)i << 2); } public float get() { @@ -229,7 +232,7 @@ public FloatBuffer get(float[] dst, int offset, int length) { - if ((length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToIntArray(ix(pos), dst, - offset << 2, - length << 2); + (long)offset << 2, + (long)length << 2); else - Bits.copyToByteArray(ix(pos), dst, - offset << 2, - length << 2); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 2, + (long)length << 2); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 2); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 2); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public FloatBuffer put(float[] src, int offset, int length) { - if ((length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromIntArray(src, offset << 2, - ix(pos), length << 2); + Bits.copyFromIntArray(src, + (long)offset << 2, + ix(pos), + (long)length << 2); else - Bits.copyFromByteArray(src, offset << 2, - ix(pos), length << 2); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 2, + ix(pos), + (long)length << 2); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 2); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 2); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectFloatBufferU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectFloatBufferU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(float[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 2); + return address + ((long)i << 2); } public float get() { @@ -229,7 +232,7 @@ public FloatBuffer get(float[] dst, int offset, int length) { - if ((length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToIntArray(ix(pos), dst, - offset << 2, - length << 2); + (long)offset << 2, + (long)length << 2); else - Bits.copyToByteArray(ix(pos), dst, - offset << 2, - length << 2); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 2, + (long)length << 2); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 2); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 2); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public FloatBuffer put(float[] src, int offset, int length) { - if ((length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromIntArray(src, offset << 2, - ix(pos), length << 2); + Bits.copyFromIntArray(src, + (long)offset << 2, + ix(pos), + (long)length << 2); else - Bits.copyFromByteArray(src, offset << 2, - ix(pos), length << 2); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 2, + ix(pos), + (long)length << 2); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 2); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 2); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectIntBufferRS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectIntBufferRS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectIntBufferRS(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public IntBuffer put(int x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectIntBufferRU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectIntBufferRU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectIntBufferRU(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public IntBuffer put(int x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectIntBufferS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectIntBufferS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(int[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 2); + return address + ((long)i << 2); } public int get() { @@ -229,7 +232,7 @@ public IntBuffer get(int[] dst, int offset, int length) { - if ((length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToIntArray(ix(pos), dst, - offset << 2, - length << 2); + (long)offset << 2, + (long)length << 2); else - Bits.copyToByteArray(ix(pos), dst, - offset << 2, - length << 2); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 2, + (long)length << 2); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 2); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 2); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public IntBuffer put(int[] src, int offset, int length) { - if ((length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromIntArray(src, offset << 2, - ix(pos), length << 2); + Bits.copyFromIntArray(src, + (long)offset << 2, + ix(pos), + (long)length << 2); else - Bits.copyFromByteArray(src, offset << 2, - ix(pos), length << 2); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 2, + ix(pos), + (long)length << 2); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 2); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 2); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectIntBufferU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectIntBufferU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(int[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 2); + return address + ((long)i << 2); } public int get() { @@ -229,7 +232,7 @@ public IntBuffer get(int[] dst, int offset, int length) { - if ((length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 2) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToIntArray(ix(pos), dst, - offset << 2, - length << 2); + (long)offset << 2, + (long)length << 2); else - Bits.copyToByteArray(ix(pos), dst, - offset << 2, - length << 2); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 2, + (long)length << 2); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 2); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 2); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public IntBuffer put(int[] src, int offset, int length) { - if ((length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 2) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromIntArray(src, offset << 2, - ix(pos), length << 2); + Bits.copyFromIntArray(src, + (long)offset << 2, + ix(pos), + (long)length << 2); else - Bits.copyFromByteArray(src, offset << 2, - ix(pos), length << 2); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 2, + ix(pos), + (long)length << 2); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 2); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 2); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectLongBufferRS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectLongBufferRS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectLongBufferRS(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public LongBuffer put(long x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectLongBufferRU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectLongBufferRU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectLongBufferRU(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public LongBuffer put(long x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectLongBufferS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectLongBufferS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(long[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 3); + return address + ((long)i << 3); } public long get() { @@ -229,7 +232,7 @@ public LongBuffer get(long[] dst, int offset, int length) { - if ((length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToLongArray(ix(pos), dst, - offset << 3, - length << 3); + (long)offset << 3, + (long)length << 3); else - Bits.copyToByteArray(ix(pos), dst, - offset << 3, - length << 3); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 3, + (long)length << 3); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 3); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 3); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public LongBuffer put(long[] src, int offset, int length) { - if ((length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromLongArray(src, offset << 3, - ix(pos), length << 3); + Bits.copyFromLongArray(src, + (long)offset << 3, + ix(pos), + (long)length << 3); else - Bits.copyFromByteArray(src, offset << 3, - ix(pos), length << 3); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 3, + ix(pos), + (long)length << 3); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 3); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 3); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectLongBufferU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectLongBufferU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(long[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 3); + return address + ((long)i << 3); } public long get() { @@ -229,7 +232,7 @@ public LongBuffer get(long[] dst, int offset, int length) { - if ((length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 3) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToLongArray(ix(pos), dst, - offset << 3, - length << 3); + (long)offset << 3, + (long)length << 3); else - Bits.copyToByteArray(ix(pos), dst, - offset << 3, - length << 3); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 3, + (long)length << 3); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 3); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 3); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public LongBuffer put(long[] src, int offset, int length) { - if ((length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 3) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromLongArray(src, offset << 3, - ix(pos), length << 3); + Bits.copyFromLongArray(src, + (long)offset << 3, + ix(pos), + (long)length << 3); else - Bits.copyFromByteArray(src, offset << 3, - ix(pos), length << 3); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 3, + ix(pos), + (long)length << 3); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 3); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 3); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectShortBufferRS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectShortBufferRS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectShortBufferRS(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public ShortBuffer put(short x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectShortBufferRU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectShortBufferRU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -159,6 +159,9 @@ + + + // For duplicates and slices // DirectShortBufferRU(DirectBuffer db, // package-private @@ -258,6 +261,8 @@ + + public ShortBuffer put(short x) { @@ -340,6 +345,12 @@ + + + + + + throw new ReadOnlyBufferException(); }
--- a/generated/java/nio/DirectShortBufferS.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectShortBufferS.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(short[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 1); + return address + ((long)i << 1); } public short get() { @@ -229,7 +232,7 @@ public ShortBuffer get(short[] dst, int offset, int length) { - if ((length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToShortArray(ix(pos), dst, - offset << 1, - length << 1); + (long)offset << 1, + (long)length << 1); else - Bits.copyToByteArray(ix(pos), dst, - offset << 1, - length << 1); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 1, + (long)length << 1); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 1); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 1); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public ShortBuffer put(short[] src, int offset, int length) { - if ((length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromShortArray(src, offset << 1, - ix(pos), length << 1); + Bits.copyFromShortArray(src, + (long)offset << 1, + ix(pos), + (long)length << 1); else - Bits.copyFromByteArray(src, offset << 1, - ix(pos), length << 1); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 1, + ix(pos), + (long)length << 1); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 1); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 1); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DirectShortBufferU.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DirectShortBufferU.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2005, 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,9 +18,9 @@ * 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! -- // @@ -47,6 +47,9 @@ // Cached unsafe-access object protected static final Unsafe unsafe = Bits.unsafe(); + // Cached array base offset + private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset(short[].class); + // Cached unaligned-access capability protected static final boolean unaligned = Bits.unaligned(); @@ -216,7 +219,7 @@ } private long ix(int i) { - return address + (i << 1); + return address + ((long)i << 1); } public short get() { @@ -229,7 +232,7 @@ public ShortBuffer get(short[] dst, int offset, int length) { - if ((length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { + if (((long)length << 1) > Bits.JNI_COPY_TO_ARRAY_THRESHOLD) { checkBounds(offset, length, dst.length); int pos = position(); int lim = limit(); @@ -238,14 +241,16 @@ if (length > rem) throw new BufferUnderflowException(); + if (order() != ByteOrder.nativeOrder()) Bits.copyToShortArray(ix(pos), dst, - offset << 1, - length << 1); + (long)offset << 1, + (long)length << 1); else - Bits.copyToByteArray(ix(pos), dst, - offset << 1, - length << 1); + + Bits.copyToArray(ix(pos), dst, arrayBaseOffset, + (long)offset << 1, + (long)length << 1); position(pos + length); } else { super.get(dst, offset, length); @@ -295,7 +300,7 @@ if (srem > rem) throw new BufferOverflowException(); - unsafe.copyMemory(sb.ix(spos), ix(pos), srem << 1); + unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << 1); sb.position(spos + srem); position(pos + srem); } else if (src.hb != null) { @@ -319,7 +324,7 @@ public ShortBuffer put(short[] src, int offset, int length) { - if ((length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { + if (((long)length << 1) > Bits.JNI_COPY_FROM_ARRAY_THRESHOLD) { checkBounds(offset, length, src.length); int pos = position(); int lim = limit(); @@ -328,12 +333,18 @@ if (length > rem) throw new BufferOverflowException(); + if (order() != ByteOrder.nativeOrder()) - Bits.copyFromShortArray(src, offset << 1, - ix(pos), length << 1); + Bits.copyFromShortArray(src, + (long)offset << 1, + ix(pos), + (long)length << 1); else - Bits.copyFromByteArray(src, offset << 1, - ix(pos), length << 1); + + Bits.copyFromArray(src, arrayBaseOffset, + (long)offset << 1, + ix(pos), + (long)length << 1); position(pos + length); } else { super.put(src, offset, length); @@ -351,7 +362,7 @@ assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - unsafe.copyMemory(ix(pos), ix(0), rem << 1); + unsafe.copyMemory(ix(pos), ix(0), (long)rem << 1); position(rem); limit(capacity()); discardMark();
--- a/generated/java/nio/DoubleBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/DoubleBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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,9 +18,9 @@ * 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! -- // @@ -1059,7 +1059,7 @@ - + /** * Returns the current hash code of this buffer.
--- a/generated/java/nio/FloatBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/FloatBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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,9 +18,9 @@ * 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! -- // @@ -1059,7 +1059,7 @@ - + /** * Returns the current hash code of this buffer.
--- a/generated/java/nio/HeapByteBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapByteBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapByteBufferR.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapByteBufferR.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapCharBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapCharBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapCharBufferR.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapCharBufferR.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapDoubleBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapDoubleBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapDoubleBufferR.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapDoubleBufferR.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapFloatBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapFloatBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapFloatBufferR.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapFloatBufferR.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapIntBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapIntBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapIntBufferR.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapIntBufferR.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapLongBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapLongBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapLongBufferR.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapLongBufferR.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapShortBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapShortBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/HeapShortBufferR.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/HeapShortBufferR.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2002, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/IntBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/IntBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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,9 +18,9 @@ * 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! -- // @@ -1059,7 +1059,7 @@ - + /** * Returns the current hash code of this buffer.
--- a/generated/java/nio/InvalidMarkException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/InvalidMarkException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/LongBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/LongBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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,9 +18,9 @@ * 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! -- // @@ -1059,7 +1059,7 @@ - + /** * Returns the current hash code of this buffer.
--- a/generated/java/nio/ReadOnlyBufferException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ReadOnlyBufferException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/ShortBuffer.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/ShortBuffer.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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,9 +18,9 @@ * 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! -- // @@ -1059,7 +1059,7 @@ - + /** * Returns the current hash code of this buffer.
--- a/generated/java/nio/channels/AlreadyConnectedException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/AlreadyConnectedException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/AsynchronousCloseException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/AsynchronousCloseException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/CancelledKeyException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/CancelledKeyException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/ClosedByInterruptException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/ClosedByInterruptException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/ClosedChannelException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/ClosedChannelException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/ClosedSelectorException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/ClosedSelectorException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/ConnectionPendingException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/ConnectionPendingException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/FileLockInterruptionException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/FileLockInterruptionException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/IllegalBlockingModeException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/IllegalBlockingModeException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/IllegalSelectorException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/IllegalSelectorException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/NoConnectionPendingException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/NoConnectionPendingException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/NonReadableChannelException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/NonReadableChannelException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/NonWritableChannelException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/NonWritableChannelException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/NotYetBoundException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/NotYetBoundException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/NotYetConnectedException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/NotYetConnectedException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/OverlappingFileLockException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/OverlappingFileLockException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/UnresolvedAddressException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/UnresolvedAddressException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/channels/UnsupportedAddressTypeException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/channels/UnsupportedAddressTypeException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/charset/CharacterCodingException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/charset/CharacterCodingException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/charset/CharsetDecoder.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/charset/CharsetDecoder.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2006, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/charset/CharsetEncoder.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/charset/CharsetEncoder.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,12 +1,12 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2006, 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,9 +18,9 @@ * 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! -- //
--- a/generated/java/nio/charset/IllegalCharsetNameException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/charset/IllegalCharsetNameException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/generated/java/nio/charset/UnsupportedCharsetException.java Tue Aug 18 23:08:20 2015 +0100 +++ b/generated/java/nio/charset/UnsupportedCharsetException.java Tue Oct 27 16:35:07 2015 +0000 @@ -1,13 +1,13 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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 @@ -19,9 +19,9 @@ * 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. * */
--- a/patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch Tue Aug 18 23:08:20 2015 +0100 +++ b/patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch Tue Oct 27 16:35:07 2015 +0000 @@ -1,15 +1,15 @@ diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/krb5/Credentials.java openjdk/jdk/src/share/classes/sun/security/krb5/Credentials.java ---- openjdk.orig/jdk/src/share/classes/sun/security/krb5/Credentials.java 2011-11-14 22:12:05.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/krb5/Credentials.java 2012-05-10 00:33:46.400831829 +0100 -@@ -38,6 +38,7 @@ - import java.io.File; +--- openjdk.orig/jdk/src/share/classes/sun/security/krb5/Credentials.java 2015-10-26 18:40:10.645524086 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/krb5/Credentials.java 2015-10-27 01:13:22.017703153 +0000 +@@ -35,6 +35,7 @@ + import sun.security.krb5.internal.crypto.EType; import java.io.IOException; import java.util.Date; +import java.util.Locale; - import java.util.Vector; - import java.io.BufferedReader; - import java.io.InputStreamReader; -@@ -261,7 +262,7 @@ + import java.net.InetAddress; + + /** +@@ -268,7 +269,7 @@ // The default ticket cache on Windows is not a file. String os = java.security.AccessController.doPrivileged( new sun.security.action.GetPropertyAction("os.name")); @@ -19,8 +19,8 @@ if (creds == null) { if (DEBUG) { diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java openjdk/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java ---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java 2011-11-14 22:12:05.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java 2012-05-10 00:33:27.400535064 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java 2015-10-26 18:40:10.741522482 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java 2015-10-27 01:13:09.697910241 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. @@ -46,8 +46,8 @@ /** diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java ---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-05-09 23:52:55.654306629 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-05-10 00:33:27.412535252 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2015-10-27 00:25:34.802092132 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2015-10-27 01:13:09.701910173 +0000 @@ -26,6 +26,7 @@ import java.nio.ByteBuffer; @@ -56,7 +56,7 @@ import java.security.*; import java.security.spec.*; -@@ -200,7 +201,7 @@ +@@ -201,7 +202,7 @@ } private int parseMode(String mode) throws NoSuchAlgorithmException { @@ -65,7 +65,7 @@ int result; if (mode.equals("ECB")) { result = MODE_ECB; -@@ -221,7 +222,7 @@ +@@ -222,7 +223,7 @@ throws NoSuchPaddingException { paddingObj = null; padBuffer = null; @@ -75,8 +75,8 @@ paddingType = PAD_NONE; } else if (padding.equals("PKCS5PADDING")) { diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java ---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2011-11-14 22:12:05.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2012-05-10 00:33:27.412535252 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2015-10-27 00:25:35.530079682 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2015-10-27 01:13:09.701910173 +0000 @@ -29,6 +29,8 @@ import java.security.spec.AlgorithmParameterSpec; import java.security.spec.*; @@ -86,7 +86,7 @@ import javax.crypto.*; import javax.crypto.spec.*; -@@ -110,7 +112,7 @@ +@@ -118,7 +120,7 @@ protected void engineSetPadding(String padding) throws NoSuchPaddingException { @@ -96,8 +96,8 @@ // empty } else { diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java openjdk/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java ---- openjdk.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2011-11-14 22:12:06.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2012-05-10 00:34:30.061514202 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2015-10-26 18:40:10.833520945 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java 2015-10-27 01:13:09.701910173 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -123,8 +123,8 @@ ldapCertStore = LDAPCertStore.getInstance(LDAPCertStore.getParameters(uri)); diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java openjdk/jdk/src/share/classes/sun/security/util/Debug.java ---- openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java 2011-11-14 22:12:06.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java 2012-05-10 00:33:27.412535252 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java 2015-10-26 18:40:10.933519274 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java 2015-10-27 01:13:09.701910173 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. @@ -150,8 +150,8 @@ return target.toString(); } diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/x509/AlgorithmId.java openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java ---- openjdk.orig/jdk/src/share/classes/sun/security/x509/AlgorithmId.java 2011-11-14 22:12:06.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java 2012-05-10 00:33:58.949027881 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/security/x509/AlgorithmId.java 2015-10-26 18:40:10.973518606 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java 2015-10-27 01:13:09.701910173 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. @@ -204,8 +204,8 @@ private static ObjectIdentifier oid(int ... values) { diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/x509/AVA.java openjdk/jdk/src/share/classes/sun/security/x509/AVA.java ---- openjdk.orig/jdk/src/share/classes/sun/security/x509/AVA.java 2011-11-14 22:12:06.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/x509/AVA.java 2012-05-10 00:34:07.773165778 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/security/x509/AVA.java 2015-10-26 18:40:10.973518606 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/x509/AVA.java 2015-10-27 01:13:09.701910173 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. @@ -223,8 +223,8 @@ if (keyword.startsWith(" ") || keyword.endsWith(" ")) { throw new IOException("Invalid leading or trailing space " + diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/x509/DNSName.java openjdk/jdk/src/share/classes/sun/security/x509/DNSName.java ---- openjdk.orig/jdk/src/share/classes/sun/security/x509/DNSName.java 2011-11-14 22:12:07.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/x509/DNSName.java 2012-05-10 00:33:27.412535252 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/security/x509/DNSName.java 2015-10-26 18:40:10.985518405 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/x509/DNSName.java 2015-10-27 01:13:09.701910173 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved. @@ -253,8 +253,8 @@ constraintType = NAME_MATCH; else if (thisName.endsWith(inName)) { diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/x509/RFC822Name.java openjdk/jdk/src/share/classes/sun/security/x509/RFC822Name.java ---- openjdk.orig/jdk/src/share/classes/sun/security/x509/RFC822Name.java 2011-11-14 22:12:07.000000000 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/x509/RFC822Name.java 2012-05-10 00:33:27.412535252 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/security/x509/RFC822Name.java 2015-10-26 18:40:11.001518138 +0000 ++++ openjdk/jdk/src/share/classes/sun/security/x509/RFC822Name.java 2015-10-27 01:13:09.701910173 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved. @@ -284,7 +284,7 @@ } else if (thisName.endsWith(inName)) { diff -Nru openjdk.orig/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java openjdk/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java --- openjdk.orig/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java 2012-05-10 00:33:27.412535252 +0100 ++++ openjdk/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java 2015-10-27 01:13:09.701910173 +0000 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
--- a/patches/version.patch Tue Aug 18 23:08:20 2015 +0100 +++ b/patches/version.patch Tue Oct 27 16:35:07 2015 +0000 @@ -27,8 +27,8 @@ @$(MV) $@.temp $@ diff -r 134c345baf84 src/share/classes/sun/misc/Version-template.java ---- openjdk.orig/jdk/src/share/classes/sun/misc/Version-template.java Thu Jun 18 11:12:13 2009 +0800 -+++ openjdk/jdk/src/share/classes/sun/misc/Version-template.java Sat Jan 09 00:26:19 2010 +0000 +--- openjdk.orig/jdk/src/share/classes/sun/misc/Version.java.template Thu Jun 18 11:12:13 2009 +0800 ++++ openjdk/jdk/src/share/classes/sun/misc/Version.java.template Sat Jan 09 00:26:19 2010 +0000 @@ -41,6 +41,21 @@ private static final String java_runtime_version = "@@java_runtime_version@@";