/hg/release/icedtea7-forest-2.6/jdk: 28 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Oct 27 05:06:47 UTC 2016
changeset b0930d43527b in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=b0930d43527b
author: mikael
date: Wed Oct 26 05:35:48 2016 +0100
8141491, PR3160, G592292: Unaligned memory access in Bits.c
Summary: Introduce alignment-safe Copy::conjoint_swap and j.i.m.Unsafe.copySwapMemory
Reviewed-by: jrose, dholmes, psandoz
changeset 25a53767db8a in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=25a53767db8a
author: mikael
date: Wed Feb 10 19:55:57 2016 -0800
8149611, PR3160, G592292: Add tests for Unsafe.copySwapMemory
Reviewed-by: dholmes
changeset d297a00960dc in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=d297a00960dc
author: coffeys
date: Thu Apr 10 20:01:52 2014 +0100
8038491, PR3162: Improve synchronization in ZipFile.read()
Reviewed-by: alanb, chegar
changeset 8ca5456de130 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8ca5456de130
author: igerasim
date: Thu Sep 10 23:35:48 2015 +0300
8080115, PR3162: (fs) Crash in libgio when calling Files.probeContentType(path) from parallel threads
Summary: Make GnomeFileTypeDetector.probeGio() synchronized and add a regression test based on the test source included in JDK-8080115.
Reviewed-by: chegar
changeset fa5f5c762df0 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=fa5f5c762df0
author: igerasim
date: Wed Nov 25 17:18:04 2015 +0300
8133207, PR3162: [TEST_BUG] ParallelProbes.java test fails after changes for JDK-8080115
Summary: Do not run in othervm mode.
Reviewed-by: darcy, rriggs
changeset f598cb1a0bb8 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=f598cb1a0bb8
author: igerasim
date: Wed Oct 26 06:47:52 2016 +0100
8132551, PR3162: Initialize local variables before returning them in p11_convert.c
Reviewed-by: wetmore
changeset 85f6f34f39f6 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=85f6f34f39f6
author: dbuck
date: Wed Oct 26 07:00:20 2016 +0100
8133666, PR3162: OperatingSystemMXBean reports abnormally high machine CPU consumption on Linux
Reviewed-by: sla, mgronlun
changeset 09cd6384d5c6 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=09cd6384d5c6
author: alanb
date: Tue Apr 29 13:23:08 2014 +0100
8034057, PR3162: Files.getFileStore and Files.isWritable do not work with SUBST'ed drives (win)
Reviewed-by: alanb, chegar
Contributed-by: pavel.rappo at oracle.com
changeset acb8eaef957c in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=acb8eaef957c
author: igerasim
date: Wed Oct 26 07:37:34 2016 +0100
8072466, PR3162: Deadlock when initializing MulticastSocket and DatagramSocket
Reviewed-by: chegar
changeset 544048b896ba in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=544048b896ba
author: robm
date: Wed Oct 26 08:24:19 2016 +0100
8129957, PR3162: Deadlock in JNDI LDAP implementation when closing the LDAP context
Reviewed-by: vinnie
changeset 5415090baa6f in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=5415090baa6f
author: okutsu
date: Thu Oct 01 15:16:35 2015 +0900
8081794, PR3162: ParsePosition getErrorIndex returns 0 for TimeZone parsing problem
Reviewed-by: peytoia, okutsu
Contributed-by: Naveen Kumar <naveen.ah.kumar at oracle.com>
changeset 9c268fb32f70 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=9c268fb32f70
author: coffeys
date: Thu Oct 15 09:33:03 2015 +0100
6907252, PR3162: ZipFileInputStream Not Thread-Safe
Reviewed-by: sherman
changeset 78738eafc52b in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=78738eafc52b
author: aivanov
date: Wed Oct 26 16:05:53 2016 +0100
8130136, PR3162: Swing window sometimes fails to repaint partially when it becomes exposed
Reviewed-by: alexp, serb
changeset 02f223e90d5e in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=02f223e90d5e
author: aefimov
date: Thu Jul 23 15:55:11 2015 +0300
8078495, PR3162: End time checking for native TGT is wrong
Reviewed-by: xuelei
changeset 1986ab27ea0b in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1986ab27ea0b
author: jgodinez
date: Mon Oct 24 09:58:47 2011 -0700
6604109, PR3162: javax.print.PrintServiceLookup.lookupPrintServices fails SOMETIMES for Cups
Reviewed-by: bae, prr
changeset 16aa1c34e2c4 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=16aa1c34e2c4
author: igerasim
date: Wed Oct 26 18:39:48 2016 +0100
8130274, PR3162: java/nio/file/FileStore/Basic.java fails when two successive stores in an iteration are determined to be equal
Summary: Make UnixFileStore.equals() also compare the return values of name(), the names of the mounted filesystems.
Reviewed-by: alanb
changeset 787747c15232 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=787747c15232
author: kshefov
date: Fri Jun 05 19:14:49 2015 +0300
8066188, PR3162: BaseRowSet returns the wrong default value for escape processing
Reviewed-by: alanb, lancea
Contributed-by: maxim.soloviev at oracle.com
changeset 7b3d92674796 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=7b3d92674796
author: kshefov
date: Thu Oct 27 01:37:56 2016 +0100
8062198, PR3162: Add RowSetMetaDataImpl Tests and add column range validation to isdefinitlyWritable
Reviewed-by: joehw, lancea
Contributed-by: maxim.soloviev at oracle.com
changeset 82067c87496d in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=82067c87496d
author: kshefov
date: Thu Oct 27 01:52:59 2016 +0100
8059411, PR3162: RowSetWarning does not correctly chain warnings
Reviewed-by: darcy, smarks, mchung, lancea
Contributed-by: maxim.soloviev at oracle.com
changeset 8aaee9c91c63 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8aaee9c91c63
author: igerasim
date: Fri Oct 09 20:11:18 2015 +0300
8137121, PR3162: (fc) Infinite loop FileChannel.truncate
Reviewed-by: alanb
changeset 2751730ffae1 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=2751730ffae1
author: igerasim
date: Thu Oct 27 02:27:38 2016 +0100
8137230, PR3162: TEST_BUG: java/nio/channels/FileChannel/LoopingTruncate.java timed out
Summary: Includes changes to Utils from 8022221 (TIMEOUT_FACTOR) & 8059070 (adjustTimeout)
Reviewed-by: rriggs
changeset bc86cb0b4331 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=bc86cb0b4331
author: coffeys
date: Thu Oct 15 14:41:37 2015 +0100
8038502, PR3162: Deflater.needsInput() should use synchronization
Reviewed-by: chegar
changeset 04922015b635 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=04922015b635
author: igerasim
date: Thu Oct 27 02:44:35 2016 +0100
8139373, PR3162: [TEST_BUG] java/net/MulticastSocket/MultiDead.java failed with timeout
Reviewed-by: chegar
changeset b03ecf9d57c9 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=b03ecf9d57c9
author: weijun
date: Mon Sep 09 11:08:20 2013 +0800
8024046, PR3162: Test sun/security/krb5/runNameEquals.sh failed on 7u45 Embedded linux-ppc*
Reviewed-by: xuelei
changeset 1e1f7f645ab9 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=1e1f7f645ab9
author: weijun
date: Tue Nov 19 14:14:14 2013 +0800
8028479, PR3162: runNameEquals still cannot precisely detect if a usable native krb5 is available
Reviewed-by: xuelei
changeset e97831e64ad3 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=e97831e64ad3
author: andrew
date: Thu Oct 27 03:05:41 2016 +0100
8078668, PR3162: jar usage string mentions unsupported option '-n'
changeset db7f4c441246 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=db7f4c441246
author: andrew
date: Wed Oct 26 03:51:39 2016 +0100
PR3207, RH1367357: lcms2: Out-of-bounds read in Type_MLU_Read()
changeset 0819886b3679 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=0819886b3679
author: andrew
date: Thu Oct 27 05:43:20 2016 +0100
Bump to icedtea-2.6.8pre01
diffstat:
make/java/java/FILES_c.gmk | 1 -
make/java/java/mapfile-vers | 6 -
make/java/net/FILES_c.gmk | 1 -
make/java/net/mapfile-vers | 5 +-
make/jdk_generic_profile.sh | 2 +-
src/share/classes/com/sun/jndi/ldap/LdapClient.java | 55 +-
src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java | 6 +-
src/share/classes/java/nio/Bits.java | 142 +-
src/share/classes/java/text/SimpleDateFormat.java | 2 +-
src/share/classes/java/util/zip/Deflater.java | 4 +-
src/share/classes/java/util/zip/ZStreamRef.java | 2 +-
src/share/classes/java/util/zip/ZipFile.java | 39 +-
src/share/classes/javax/sql/rowset/BaseRowSet.java | 2 +-
src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java | 18 +-
src/share/classes/javax/sql/rowset/RowSetWarning.java | 23 +-
src/share/classes/sun/misc/Unsafe.java | 392 +++++-
src/share/classes/sun/nio/ch/FileChannelImpl.java | 5 +-
src/share/classes/sun/tools/jar/resources/jar.properties | 2 +-
src/share/classes/sun/tools/jar/resources/jar_de.properties | 2 +-
src/share/classes/sun/tools/jar/resources/jar_es.properties | 2 +-
src/share/classes/sun/tools/jar/resources/jar_fr.properties | 2 +-
src/share/classes/sun/tools/jar/resources/jar_ja.properties | 2 +-
src/share/classes/sun/tools/jar/resources/jar_ko.properties | 2 +-
src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties | 2 +-
src/share/classes/sun/tools/jar/resources/jar_sv.properties | 2 +-
src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties | 2 +-
src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties | 2 +-
src/share/native/java/nio/Bits.c | 278 ---
src/share/native/java/util/zip/zip_util.c | 18 +-
src/share/native/sun/java2d/cmm/lcms/cmstypes.c | 1 +
src/share/native/sun/security/pkcs11/wrapper/p11_convert.c | 10 +-
src/solaris/classes/java/net/PlainDatagramSocketImpl.java | 4 +-
src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java | 2 +-
src/solaris/classes/sun/nio/fs/UnixFileStore.java | 5 +-
src/solaris/classes/sun/print/UnixPrintServiceLookup.java | 2 +-
src/solaris/native/com/sun/management/LinuxOperatingSystem.c | 27 +-
src/solaris/native/java/net/AbstractPlainDatagramSocketImpl.c | 89 -
src/solaris/native/java/net/PlainDatagramSocketImpl.c | 35 +-
src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java | 31 +-
src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java | 8 +-
src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java | 4 +-
src/windows/classes/sun/nio/fs/WindowsConstants.java | 1 +
src/windows/classes/sun/nio/fs/WindowsFileStore.java | 18 +-
src/windows/classes/sun/nio/fs/WindowsLinkSupport.java | 2 +-
src/windows/native/java/net/AbstractPlainDatagramSocketImpl.c | 111 -
src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c | 50 +-
src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 43 +-
src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp | 8 +-
src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h | 3 +-
src/windows/native/sun/security/krb5/NativeCreds.c | 5 +-
src/windows/native/sun/windows/awt_Component.cpp | 14 +-
src/windows/native/sun/windows/awt_Component.h | 6 +-
test/java/net/MulticastSocket/MultiDead.java | 134 +
test/java/nio/channels/FileChannel/LoopingTruncate.java | 84 +
test/java/nio/file/Files/probeContentType/ParallelProbes.java | 96 +
test/java/text/Format/DateFormat/Bug8081794.java | 51 +
test/java/util/zip/ZipFile/MultiThreadedReadTest.java | 92 +
test/java/util/zip/ZipFile/ZipEntryFreeTest.java | 130 +
test/jdk/internal/misc/Unsafe/CopySwap.java | 723 ++++++++++
test/lib/testlibrary/jdk/testlibrary/Utils.java | 27 +
test/sun/security/krb5/runNameEquals.sh | 20 +-
61 files changed, 2209 insertions(+), 648 deletions(-)
diffs (truncated from 3899 to 500 lines):
diff -r 78984f240864 -r 0819886b3679 make/java/java/FILES_c.gmk
--- a/make/java/java/FILES_c.gmk Fri Jul 29 06:30:11 2016 +0100
+++ b/make/java/java/FILES_c.gmk Thu Oct 27 05:43:20 2016 +0100
@@ -72,7 +72,6 @@
GC.c \
NativeAccessors.c \
Reflection.c \
- Bits.c \
AtomicLong.c \
Version.c \
VM.c \
diff -r 78984f240864 -r 0819886b3679 make/java/java/mapfile-vers
--- a/make/java/java/mapfile-vers Fri Jul 29 06:30:11 2016 +0100
+++ b/make/java/java/mapfile-vers Thu Oct 27 05:43:20 2016 +0100
@@ -219,12 +219,6 @@
Java_java_lang_UNIXProcess_waitForProcessExit;
Java_java_lang_UNIXProcess_forkAndExec;
Java_java_lang_UNIXProcess_destroyProcess;
- Java_java_nio_Bits_copyFromShortArray;
- Java_java_nio_Bits_copyToShortArray;
- Java_java_nio_Bits_copyFromIntArray;
- Java_java_nio_Bits_copyToIntArray;
- Java_java_nio_Bits_copyFromLongArray;
- Java_java_nio_Bits_copyToLongArray;
Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2;
Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2;
diff -r 78984f240864 -r 0819886b3679 make/java/net/FILES_c.gmk
--- a/make/java/net/FILES_c.gmk Fri Jul 29 06:30:11 2016 +0100
+++ b/make/java/net/FILES_c.gmk Thu Oct 27 05:43:20 2016 +0100
@@ -24,7 +24,6 @@
#
FILES_c = \
- AbstractPlainDatagramSocketImpl.c \
DatagramPacket.c \
ExtendedOptionsImpl.c \
InetAddress.c \
diff -r 78984f240864 -r 0819886b3679 make/java/net/mapfile-vers
--- a/make/java/net/mapfile-vers Fri Jul 29 06:30:11 2016 +0100
+++ b/make/java/net/mapfile-vers Thu Oct 27 05:43:20 2016 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2015, 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
@@ -28,8 +28,7 @@
SUNWprivate_1.1 {
global:
JNI_OnLoad;
- Java_java_net_AbstractPlainDatagramSocketImpl_init;
- Java_java_net_AbstractPlainDatagramSocketImpl_dataAvailable;
+ Java_java_net_PlainDatagramSocketImpl_dataAvailable;
Java_java_net_PlainSocketImpl_socketListen;
Java_java_net_PlainDatagramSocketImpl_getTTL;
Java_java_net_PlainDatagramSocketImpl_init;
diff -r 78984f240864 -r 0819886b3679 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh Fri Jul 29 06:30:11 2016 +0100
+++ b/make/jdk_generic_profile.sh Thu Oct 27 05:43:20 2016 +0100
@@ -671,7 +671,7 @@
# IcedTea versioning
export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.6.7"
+export PACKAGE_VERSION="2.6.8pre01"
export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
echo "Building ${DERIVATIVE_ID}"
diff -r 78984f240864 -r 0819886b3679 src/share/classes/com/sun/jndi/ldap/LdapClient.java
--- a/src/share/classes/com/sun/jndi/ldap/LdapClient.java Fri Jul 29 06:30:11 2016 +0100
+++ b/src/share/classes/com/sun/jndi/ldap/LdapClient.java Thu Oct 27 05:43:20 2016 +0100
@@ -494,16 +494,14 @@
*/
void processConnectionClosure() {
// Notify listeners
- synchronized (unsolicited) {
- if (unsolicited.size() > 0) {
- String msg;
- if (conn != null) {
- msg = conn.host + ":" + conn.port + " connection closed";
- } else {
- msg = "Connection closed";
- }
- notifyUnsolicited(new CommunicationException(msg));
+ if (unsolicited.size() > 0) {
+ String msg;
+ if (conn != null) {
+ msg = conn.host + ":" + conn.port + " connection closed";
+ } else {
+ msg = "Connection closed";
}
+ notifyUnsolicited(new CommunicationException(msg));
}
// Remove from pool
@@ -1484,7 +1482,7 @@
// removeUnsolicited() is invoked to remove an LdapCtx from this client.
//
////////////////////////////////////////////////////////////////////////////
- private Vector unsolicited = new Vector(3);
+ private Vector<LdapCtx> unsolicited = new Vector<LdapCtx>(3);
void addUnsolicited(LdapCtx ctx) {
if (debug > 0) {
System.err.println("LdapClient.addUnsolicited" + ctx);
@@ -1496,13 +1494,8 @@
if (debug > 0) {
System.err.println("LdapClient.removeUnsolicited" + ctx);
}
- synchronized (unsolicited) {
- if (unsolicited.size() == 0) {
- return;
- }
unsolicited.removeElement(ctx);
}
- }
// NOTE: Cannot be synchronized because this is called asynchronously
// by the reader thread in Connection. Instead, sync on 'unsolicited' Vector.
@@ -1510,7 +1503,6 @@
if (debug > 0) {
System.err.println("LdapClient.processUnsolicited");
}
- synchronized (unsolicited) {
try {
// Parse the response
LdapResult res = new LdapResult();
@@ -1529,11 +1521,17 @@
forceClose(pooled);
}
- if (unsolicited.size() > 0) {
+ LdapCtx first = null;
+ UnsolicitedNotification notice = null;
+
+ synchronized (unsolicited) {
+ if (unsolicited.size() > 0) {
+ first = unsolicited.elementAt(0);
+
// Create an UnsolicitedNotification using the parsed data
// Need a 'ctx' object because we want to use the context's
// list of provider control factories.
- UnsolicitedNotification notice = new UnsolicitedResponseImpl(
+ notice = new UnsolicitedResponseImpl(
res.extensionId,
res.extensionValue,
res.referrals,
@@ -1541,9 +1539,12 @@
res.errorMessage,
res.matchedDN,
(res.resControls != null) ?
- ((LdapCtx)unsolicited.elementAt(0)).convertControls(res.resControls) :
+ first.convertControls(res.resControls) :
null);
+ }
+ }
+ if (notice != null) {
// Fire UnsolicitedNotification events to listeners
notifyUnsolicited(notice);
@@ -1555,9 +1556,6 @@
}
}
} catch (IOException e) {
- if (unsolicited.size() == 0)
- return; // no one registered; ignore
-
NamingException ne = new CommunicationException(
"Problem parsing unsolicited notification");
ne.setRootCause(e);
@@ -1567,16 +1565,19 @@
} catch (NamingException e) {
notifyUnsolicited(e);
}
- }
}
private void notifyUnsolicited(Object e) {
- for (int i = 0; i < unsolicited.size(); i++) {
- ((LdapCtx)unsolicited.elementAt(i)).fireUnsolicited(e);
+ Vector<LdapCtx> unsolicitedCopy;
+ synchronized (unsolicited) {
+ unsolicitedCopy = new Vector<>(unsolicited);
+ if (e instanceof NamingException) {
+ unsolicited.setSize(0); // no more listeners after exception
+ }
}
- if (e instanceof NamingException) {
- unsolicited.setSize(0); // no more listeners after exception
+ for (int i = 0; i < unsolicitedCopy.size(); i++) {
+ unsolicitedCopy.elementAt(i).fireUnsolicited(e);
}
}
diff -r 78984f240864 -r 0819886b3679 src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
--- a/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Fri Jul 29 06:30:11 2016 +0100
+++ b/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Thu Oct 27 05:43:20 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, 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
@@ -70,7 +70,6 @@
static {
java.security.AccessController.doPrivileged(
new sun.security.action.LoadLibraryAction("net"));
- init();
}
/**
@@ -364,6 +363,5 @@
return connectDisabled;
}
- native int dataAvailable();
- private static native void init();
+ abstract int dataAvailable();
}
diff -r 78984f240864 -r 0819886b3679 src/share/classes/java/nio/Bits.java
--- a/src/share/classes/java/nio/Bits.java Fri Jul 29 06:30:11 2016 +0100
+++ b/src/share/classes/java/nio/Bits.java Thu Oct 27 05:43:20 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -754,31 +754,131 @@
}
}
- static void copyFromCharArray(Object src, long srcPos, long dstAddr,
- long length)
- {
- copyFromShortArray(src, srcPos, dstAddr, length);
+ /**
+ * Copy and unconditionally byte swap 16 bit elements from a heap array to off-heap memory
+ *
+ * @param src
+ * the source array, must be a 16-bit primitive array type
+ * @param srcPos
+ * byte offset within source array of the first element to read
+ * @param dstAddr
+ * destination address
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyFromCharArray(Object src, long srcPos, long dstAddr, long length) {
+ unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 2);
}
- static void copyToCharArray(long srcAddr, Object dst, long dstPos,
- long length)
- {
- copyToShortArray(srcAddr, dst, dstPos, length);
+ /**
+ * Copy and unconditionally byte swap 16 bit elements from off-heap memory to a heap array
+ *
+ * @param srcAddr
+ * source address
+ * @param dst
+ * destination array, must be a 16-bit primitive array type
+ * @param dstPos
+ * byte offset within the destination array of the first element to write
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyToCharArray(long srcAddr, Object dst, long dstPos, long length) {
+ unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 2);
}
- static native void copyFromShortArray(Object src, long srcPos, long dstAddr,
- long length);
- static native void copyToShortArray(long srcAddr, Object dst, long dstPos,
- long length);
+ /**
+ * Copy and unconditionally byte swap 16 bit elements from a heap array to off-heap memory
+ *
+ * @param src
+ * the source array, must be a 16-bit primitive array type
+ * @param srcPos
+ * byte offset within source array of the first element to read
+ * @param dstAddr
+ * destination address
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyFromShortArray(Object src, long srcPos, long dstAddr, long length) {
+ unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 2);
+ }
- static native void copyFromIntArray(Object src, long srcPos, long dstAddr,
- long length);
- static native void copyToIntArray(long srcAddr, Object dst, long dstPos,
- long length);
+ /**
+ * Copy and unconditionally byte swap 16 bit elements from off-heap memory to a heap array
+ *
+ * @param srcAddr
+ * source address
+ * @param dst
+ * destination array, must be a 16-bit primitive array type
+ * @param dstPos
+ * byte offset within the destination array of the first element to write
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyToShortArray(long srcAddr, Object dst, long dstPos, long length) {
+ unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 2);
+ }
- static native void copyFromLongArray(Object src, long srcPos, long dstAddr,
- long length);
- static native void copyToLongArray(long srcAddr, Object dst, long dstPos,
- long length);
+ /**
+ * Copy and unconditionally byte swap 32 bit elements from a heap array to off-heap memory
+ *
+ * @param src
+ * the source array, must be a 32-bit primitive array type
+ * @param srcPos
+ * byte offset within source array of the first element to read
+ * @param dstAddr
+ * destination address
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyFromIntArray(Object src, long srcPos, long dstAddr, long length) {
+ unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 4);
+ }
+ /**
+ * Copy and unconditionally byte swap 32 bit elements from off-heap memory to a heap array
+ *
+ * @param srcAddr
+ * source address
+ * @param dst
+ * destination array, must be a 32-bit primitive array type
+ * @param dstPos
+ * byte offset within the destination array of the first element to write
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyToIntArray(long srcAddr, Object dst, long dstPos, long length) {
+ unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 4);
+ }
+
+ /**
+ * Copy and unconditionally byte swap 64 bit elements from a heap array to off-heap memory
+ *
+ * @param src
+ * the source array, must be a 64-bit primitive array type
+ * @param srcPos
+ * byte offset within source array of the first element to read
+ * @param dstAddr
+ * destination address
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyFromLongArray(Object src, long srcPos, long dstAddr, long length) {
+ unsafe.copySwapMemory(src, unsafe.arrayBaseOffset(src.getClass()) + srcPos, null, dstAddr, length, 8);
+ }
+
+ /**
+ * Copy and unconditionally byte swap 64 bit elements from off-heap memory to a heap array
+ *
+ * @param srcAddr
+ * source address
+ * @param dst
+ * destination array, must be a 64-bit primitive array type
+ * @param dstPos
+ * byte offset within the destination array of the first element to write
+ * @param length
+ * number of bytes to copy
+ */
+ static void copyToLongArray(long srcAddr, Object dst, long dstPos, long length) {
+ unsafe.copySwapMemory(null, srcAddr, dst, unsafe.arrayBaseOffset(dst.getClass()) + dstPos, length, 8);
+ }
}
diff -r 78984f240864 -r 0819886b3679 src/share/classes/java/text/SimpleDateFormat.java
--- a/src/share/classes/java/text/SimpleDateFormat.java Fri Jul 29 06:30:11 2016 +0100
+++ b/src/share/classes/java/text/SimpleDateFormat.java Thu Oct 27 05:43:20 2016 +0100
@@ -1650,7 +1650,7 @@
}
return (start + zoneNames[nameIndex].length());
}
- return 0;
+ return -start;
}
/**
diff -r 78984f240864 -r 0819886b3679 src/share/classes/java/util/zip/Deflater.java
--- a/src/share/classes/java/util/zip/Deflater.java Fri Jul 29 06:30:11 2016 +0100
+++ b/src/share/classes/java/util/zip/Deflater.java Thu Oct 27 05:43:20 2016 +0100
@@ -306,7 +306,9 @@
* should be called in order to provide more input
*/
public boolean needsInput() {
- return len <= 0;
+ synchronized (zsRef) {
+ return len <= 0;
+ }
}
/**
diff -r 78984f240864 -r 0819886b3679 src/share/classes/java/util/zip/ZStreamRef.java
--- a/src/share/classes/java/util/zip/ZStreamRef.java Fri Jul 29 06:30:11 2016 +0100
+++ b/src/share/classes/java/util/zip/ZStreamRef.java Thu Oct 27 05:43:20 2016 +0100
@@ -31,7 +31,7 @@
class ZStreamRef {
- private long address;
+ private volatile long address;
ZStreamRef (long address) {
this.address = address;
}
diff -r 78984f240864 -r 0819886b3679 src/share/classes/java/util/zip/ZipFile.java
--- a/src/share/classes/java/util/zip/ZipFile.java Fri Jul 29 06:30:11 2016 +0100
+++ b/src/share/classes/java/util/zip/ZipFile.java Thu Oct 27 05:43:20 2016 +0100
@@ -54,7 +54,7 @@
*/
public
class ZipFile implements ZipConstants, Closeable {
- private long jzfile; // address of jzfile data
+ private long jzfile; // address of jzfile data
private final String name; // zip file name
private final int total; // total number of entries
private final boolean locsig; // if zip file starts with LOCSIG (usually true)
@@ -650,7 +650,7 @@
* (possibly compressed) zip file entry.
*/
private class ZipFileInputStream extends InputStream {
- private volatile boolean closeRequested = false;
+ private volatile boolean zfisCloseRequested = false;
protected long jzentry; // address of jzentry data
private long pos; // current position within entry data
protected long rem; // number of remaining bytes within entry
@@ -664,24 +664,27 @@
}
public int read(byte b[], int off, int len) throws IOException {
- if (rem == 0) {
- return -1;
- }
- if (len <= 0) {
- return 0;
- }
- if (len > rem) {
- len = (int) rem;
- }
synchronized (ZipFile.this) {
+ long rem = this.rem;
+ long pos = this.pos;
+ if (rem == 0) {
+ return -1;
+ }
+ if (len <= 0) {
+ return 0;
+ }
+ if (len > rem) {
+ len = (int) rem;
+ }
+
+ // Check if ZipFile open
ensureOpenOrZipException();
-
len = ZipFile.read(ZipFile.this.jzfile, jzentry, pos, b,
off, len);
- }
- if (len > 0) {
- pos += len;
- rem -= len;
+ if (len > 0) {
+ this.pos = (pos + len);
+ this.rem = (rem - len);
+ }
}
if (rem == 0) {
close();
@@ -718,9 +721,9 @@
}
public void close() {
- if (closeRequested)
+ if (zfisCloseRequested)
return;
- closeRequested = true;
+ zfisCloseRequested = true;
rem = 0;
synchronized (ZipFile.this) {
diff -r 78984f240864 -r 0819886b3679 src/share/classes/javax/sql/rowset/BaseRowSet.java
--- a/src/share/classes/javax/sql/rowset/BaseRowSet.java Fri Jul 29 06:30:11 2016 +0100
More information about the distro-pkg-dev
mailing list