--- a/make/autoconf/version-numbers Tue Mar 26 09:05:10 2019 -0400
+++ b/make/autoconf/version-numbers Tue Mar 26 15:25:13 2019 -0400
@@ -35,7 +35,7 @@
DEFAULT_VERSION_DATE=2019-09-17
DEFAULT_VERSION_CLASSFILE_MAJOR=57 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
DEFAULT_VERSION_CLASSFILE_MINOR=0
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="11 12 13"
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="12 13"
LAUNCHER_NAME=openjdk
PRODUCT_NAME=OpenJDK
--- a/make/conf/jib-profiles.js Tue Mar 26 09:05:10 2019 -0400
+++ b/make/conf/jib-profiles.js Tue Mar 26 15:25:13 2019 -0400
@@ -365,7 +365,8 @@
};
};
- common.boot_jdk_version = "11";
+ common.boot_jdk_version = "12";
+ common.boot_jdk_build_number = "33";
common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
+ common.boot_jdk_version
+ (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@@ -980,7 +981,7 @@
server: "jpg",
product: "jdk",
version: common.boot_jdk_version,
- build_number: "28",
+ build_number: common.boot_jdk_build_number,
file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
--- a/make/data/publicsuffixlist/VERSION Tue Mar 26 09:05:10 2019 -0400
+++ b/make/data/publicsuffixlist/VERSION Tue Mar 26 15:25:13 2019 -0400
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/2225db8d9f4a2a27ec697c883360632fa0c16261/public_suffix_list.dat
-Date: 2018-05-24
+Github: https://raw.githubusercontent.com/publicsuffix/list/ce0d1a5fba657e55adea3abde4b7f1e50636ff10/public_suffix_list.dat
+Date: 2019-01-28
--- a/make/data/publicsuffixlist/public_suffix_list.dat Tue Mar 26 09:05:10 2019 -0400
+++ b/make/data/publicsuffixlist/public_suffix_list.dat Tue Mar 26 15:25:13 2019 -0400
@@ -381,8 +381,13 @@
net.bm
org.bm
-// bn : https://en.wikipedia.org/wiki/.bn
-*.bn
+// bn : http://www.bnnic.bn/faqs
+bn
+com.bn
+edu.bn
+gov.bn
+net.bn
+org.bn
// bo : https://nic.bo/delegacion2015.php#h-1.10
bo
@@ -546,6 +551,7 @@
not.br
ntr.br
odo.br
+ong.br
org.br
osasco.br
palmas.br
@@ -1239,7 +1245,7 @@
utazas.hu
video.hu
-// id : https://register.pandi.or.id/
+// id : https://pandi.id/en/domain/registration-requirements/
id
ac.id
biz.id
@@ -1250,6 +1256,7 @@
my.id
net.id
or.id
+ponpes.id
sch.id
web.id
@@ -1407,9 +1414,9 @@
tos.it
toscana.it
trentin-sud-tirol.it
-trentin-süd-tirol.it
+trentin-süd-tirol.it
trentin-sudtirol.it
-trentin-südtirol.it
+trentin-südtirol.it
trentin-sued-tirol.it
trentin-suedtirol.it
trentino-a-adige.it
@@ -1419,9 +1426,9 @@
trentino-s-tirol.it
trentino-stirol.it
trentino-sud-tirol.it
-trentino-süd-tirol.it
+trentino-süd-tirol.it
trentino-sudtirol.it
-trentino-südtirol.it
+trentino-südtirol.it
trentino-sued-tirol.it
trentino-suedtirol.it
trentino.it
@@ -1432,15 +1439,15 @@
trentinos-tirol.it
trentinostirol.it
trentinosud-tirol.it
-trentinosüd-tirol.it
+trentinosüd-tirol.it
trentinosudtirol.it
-trentinosüdtirol.it
+trentinosüdtirol.it
trentinosued-tirol.it
trentinosuedtirol.it
trentinsud-tirol.it
-trentinsüd-tirol.it
+trentinsüd-tirol.it
trentinsudtirol.it
-trentinsüdtirol.it
+trentinsüdtirol.it
trentinsued-tirol.it
trentinsuedtirol.it
tuscany.it
@@ -1457,13 +1464,13 @@
valled-aosta.it
valledaosta.it
vallee-aoste.it
-vallée-aoste.it
+vallée-aoste.it
vallee-d-aoste.it
-vallée-d-aoste.it
+vallée-d-aoste.it
valleeaoste.it
-valléeaoste.it
+valléeaoste.it
valleedaoste.it
-valléedaoste.it
+valléedaoste.it
vao.it
vda.it
ven.it
@@ -1497,7 +1504,7 @@
avellino.it
ba.it
balsan-sudtirol.it
-balsan-südtirol.it
+balsan-südtirol.it
balsan-suedtirol.it
balsan.it
bari.it
@@ -1516,7 +1523,7 @@
bolzano-altoadige.it
bolzano.it
bozen-sudtirol.it
-bozen-südtirol.it
+bozen-südtirol.it
bozen-suedtirol.it
bozen.it
br.it
@@ -1525,7 +1532,7 @@
bs.it
bt.it
bulsan-sudtirol.it
-bulsan-südtirol.it
+bulsan-südtirol.it
bulsan-suedtirol.it
bulsan.it
bz.it
@@ -1545,9 +1552,9 @@
cb.it
ce.it
cesena-forli.it
-cesena-forlì.it
+cesena-forlì.it
cesenaforli.it
-cesenaforlì.it
+cesenaforlì.it
ch.it
chieti.it
ci.it
@@ -1578,9 +1585,9 @@
fm.it
foggia.it
forli-cesena.it
-forlì-cesena.it
+forlì-cesena.it
forlicesena.it
-forlìcesena.it
+forlìcesena.it
fr.it
frosinone.it
ge.it
@@ -1711,7 +1718,7 @@
sr.it
ss.it
suedtirol.it
-südtirol.it
+südtirol.it
sv.it
ta.it
taranto.it
@@ -3692,8 +3699,16 @@
seoul.kr
ulsan.kr
-// kw : https://en.wikipedia.org/wiki/.kw
-*.kw
+// kw : https://www.nic.kw/policies/
+// Confirmed by registry <nic.tech@citra.gov.kw>
+kw
+com.kw
+edu.kw
+emb.kw
+gov.kw
+ind.kw
+net.kw
+org.kw
// ky : http://www.icta.ky/da_ky_reg_dom.php
// Confirmed by registry <kysupport@perimeterusa.com> 2008-06-17
@@ -3775,10 +3790,18 @@
org.lr
net.lr
-// ls : https://en.wikipedia.org/wiki/.ls
+// ls : http://www.nic.ls/
+// Confirmed by registry <lsadmin@nic.ls>
ls
+ac.ls
+biz.ls
co.ls
+edu.ls
+gov.ls
+info.ls
+net.ls
org.ls
+sc.ls
// lt : https://en.wikipedia.org/wiki/.lt
lt
@@ -4636,9 +4659,6 @@
// ccTLD for the Netherlands
nl
-// BV.nl will be a registry for dutch BV's (besloten vennootschap)
-bv.nl
-
// no : http://www.norid.no/regelverk/index.en.html
// The Norwegian registry has declined to notify us of updates. The web pages
// referenced below are the official source of the data. There is also an
@@ -8329,9 +8349,6 @@
// goo : 2014-12-18 NTT Resonant Inc.
goo
-// goodhands : 2015-07-31 Allstate Fire and Casualty Insurance Company
-goodhands
-
// goodyear : 2015-07-02 The Goodyear Tire & Rubber Company
goodyear
@@ -8608,9 +8625,6 @@
// iveco : 2015-09-03 CNH Industrial N.V.
iveco
-// iwc : 2014-06-23 Richemont DNS Inc.
-iwc
-
// jaguar : 2014-11-13 Jaguar Land Rover Ltd
jaguar
@@ -8635,9 +8649,6 @@
// jio : 2015-04-02 Reliance Industries Limited
jio
-// jlc : 2014-12-04 Richemont DNS Inc.
-jlc
-
// jll : 2015-04-02 Jones Lang LaSalle Incorporated
jll
@@ -8989,9 +9000,6 @@
// menu : 2013-09-11 Wedding TLD2, LLC
menu
-// meo : 2014-11-07 MEO Servicos de Comunicacoes e Multimedia, S.A.
-meo
-
// merckmsd : 2016-07-14 MSD Registry Holdings, Inc.
merckmsd
@@ -9283,9 +9291,6 @@
// panasonic : 2015-07-30 Panasonic Corporation
panasonic
-// panerai : 2014-11-07 Richemont DNS Inc.
-panerai
-
// paris : 2014-01-30 City of Paris
paris
@@ -9634,9 +9639,6 @@
// sap : 2014-03-27 SAP AG
sap
-// sapo : 2014-11-07 MEO Servicos de Comunicacoes e Multimedia, S.A.
-sapo
-
// sarl : 2014-07-03 Binky Moon, LLC
sarl
@@ -9877,9 +9879,6 @@
// statefarm : 2015-07-30 State Farm Mutual Automobile Insurance Company
statefarm
-// statoil : 2014-12-04 Statoil ASA
-statoil
-
// stc : 2014-10-09 Saudi Telecom Company
stc
@@ -9991,9 +9990,6 @@
// technology : 2013-09-13 Binky Moon, LLC
technology
-// telecity : 2015-02-19 TelecityGroup International Limited
-telecity
-
// telefonica : 2014-10-16 Telefónica S.A.
telefonica
@@ -10201,9 +10197,6 @@
// vision : 2013-12-05 Binky Moon, LLC
vision
-// vista : 2014-09-18 Vistaprint Limited
-vista
-
// vistaprint : 2014-09-18 Vistaprint Limited
vistaprint
@@ -10642,9 +10635,6 @@
// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center
政务
-// xperia : 2015-05-14 Sony Mobile Communications AB
-xperia
-
// xyz : 2013-12-05 XYZ.COM LLC
xyz
@@ -10737,6 +10727,7 @@
// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
// Submitted by Luke Wells <psl-maintainers@amazon.com>
cn-north-1.eb.amazonaws.com.cn
+cn-northwest-1.eb.amazonaws.com.cn
elasticbeanstalk.com
ap-northeast-1.elasticbeanstalk.com
ap-northeast-2.elasticbeanstalk.com
@@ -10823,6 +10814,10 @@
t3l3p0rt.net
tele.amune.org
+// Apigee : https://apigee.com/
+// Submitted by Apigee Security Team <security@apigee.com>
+apigee.io
+
// Aptible : https://www.aptible.com/
// Submitted by Thomas Orozco <thomas@aptible.com>
on-aptible.com
@@ -10842,6 +10837,11 @@
// Submitted by Vincent Tseng <vincenttseng@asustor.com>
myasustor.com
+// Automattic Inc. : https://automattic.com/
+// Submitted by Alex Concha <alex.concha@automattic.com>
+go-vip.co
+wpcomstaging.com
+
// AVM : https://avm.de
// Submitted by Andreas Weise <a.weise@avm.de>
myfritz.net
@@ -10888,6 +10888,11 @@
// Submitted by Dave Tharp <browsersafetymark.io@quicinc.com>
browsersafetymark.io
+// Bytemark Hosting : https://www.bytemark.co.uk
+// Submitted by Paul Cammish <paul.cammish@bytemark.co.uk>
+dh.bytemark.co.uk
+vm.bytemark.co.uk
+
// callidomus : https://www.callidomus.com/
// Submitted by Marcus Popp <admin@callidomus.com>
mycd.eu
@@ -11080,6 +11085,11 @@
reg.dk
store.dk
+// dapps.earth : https://dapps.earth/
+// Submitted by Daniil Burdakov <icqkill@gmail.com>
+*.dapps.earth
+*.bzz.dapps.earth
+
// Debian : https://www.debian.org/
// Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
debian.net
@@ -11092,6 +11102,11 @@
// Submitted by Norbert Auler <mail@dnshome.de>
dnshome.de
+// DotArai : https://www.dotarai.com/
+// Submitted by Atsadawat Netcharadsang <atsadawat@dotarai.co.th>
+online.th
+shop.th
+
// DrayTek Corp. : https://www.draytek.com/
// Submitted by Paul Fang <mis@draytek.com>
drayddns.com
@@ -11648,6 +11663,10 @@
app.os.fedoraproject.org
app.os.stg.fedoraproject.org
+// Fermax : https://fermax.com/
+// submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
+mydobiss.com
+
// Filegear Inc. : https://www.filegear.com
// Submitted by Jason Zhu <jason@owtware.com>
filegear.me
@@ -11713,6 +11732,8 @@
// Google, Inc.
// Submitted by Eduardo Vela <evn@google.com>
+run.app
+a.run.app
*.0emm.com
appspot.com
blogspot.ae
@@ -11918,6 +11939,12 @@
lcube-server.de
svn-repos.de
+// Leadpages : https://www.leadpages.net
+// Submitted by Greg Dallavalle <domains@leadpages.net>
+leadpages.co
+lpages.co
+lpusercontent.com
+
// Lightmaker Property Manager, Inc. : https://app.lmpm.com/
// Submitted by Greg Holland <greg.holland@lmpm.com>
app.lmpm.com
@@ -11935,6 +11962,15 @@
// Submitted by Victor Velchev <admin@liquidnetlimited.com>
we.bs
+// LubMAN UMCS Sp. z o.o : https://lubman.pl/
+// Submitted by Ireneusz Maliszewski <ireneusz.maliszewski@lubman.pl>
+krasnik.pl
+leczna.pl
+lubartow.pl
+lublin.pl
+poniatowa.pl
+swidnik.pl
+
// Lug.org.uk : https://lug.org.uk
// Submitted by Jon Spriggs <admin@lug.org.uk>
uklugs.org
@@ -12322,6 +12358,10 @@
chirurgiens-dentistes-en-france.fr
byen.site
+// Redstar Consultants : https://www.redstarconsultants.com/
+// Submitted by Jons Slemmer <jons@redstarconsultants.com>
+instantcloud.cn
+
// Russian Academy of Sciences
// Submitted by Tech Support <support@rasnet.ru>
ras.ru
@@ -12350,6 +12390,10 @@
rackmaze.com
rackmaze.net
+// Read The Docs, Inc : https://www.readthedocs.org
+// Submitted by David Fischer <team@readthedocs.org>
+readthedocs.io
+
// Red Hat, Inc. OpenShift : https://openshift.redhat.com/
// Submitted by Tim Kramer <tkramer@rhcloud.com>
rhcloud.com
@@ -12426,6 +12470,10 @@
sinaapp.com
vipsinaapp.com
+// Siteleaf : https://www.siteleaf.com/
+// Submitted by Skylar Challand <support@siteleaf.com>
+siteleaf.net
+
// Skyhat : http://www.skyhat.io
// Submitted by Shante Adam <shante@skyhat.io>
bounty-full.com
@@ -12451,10 +12499,6 @@
// Submitted by Stefan Neufeind <info@speedpartner.de>
customer.speedpartner.de
-// Stackspace : https://www.stackspace.io/
-// Submitted by Lina He <info@stackspace.io>
-stackspace.space
-
// Storj Labs Inc. : https://storj.io/
// Submitted by Philip Hutchins <hostmaster@storj.io>
storj.farm
@@ -12495,6 +12539,12 @@
med.pl
sopot.pl
+// Telebit : https://telebit.cloud
+// Submitted by AJ ONeal <aj@telebit.cloud>
+telebit.app
+telebit.io
+*.telebit.xyz
+
// The Gwiddle Foundation : https://gwiddlefoundation.org.uk
// Submitted by Joshua Bayfield <joshua.bayfield@gwiddlefoundation.org.uk>
gwiddle.co.uk
@@ -12533,7 +12583,7 @@
webspace.rocks
lima.zone
-// TransIP : htts://www.transip.nl
+// TransIP : https://www.transip.nl
// Submitted by Rory Breuk <rbreuk@transip.nl>
*.transurl.be
*.transurl.eu
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp Tue Mar 26 09:05:10 2019 -0400
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp Tue Mar 26 15:25:13 2019 -0400
@@ -132,6 +132,10 @@
return NULL;
}
+static unsigned long ucontext_get_trap(const ucontext_t * uc) {
+ return uc->uc_mcontext.regs->trap;
+}
+
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
intptr_t** ret_sp, intptr_t** ret_fp) {
@@ -304,9 +308,22 @@
// Handle ALL stack overflow variations here
if (sig == SIGSEGV) {
- // Si_addr may not be valid due to a bug in the linux-ppc64 kernel (see
+ // si_addr may not be valid due to a bug in the linux-ppc64 kernel (see
// comment below). Use get_stack_bang_address instead of si_addr.
- address addr = ((NativeInstruction*)pc)->get_stack_bang_address(uc);
+ // If SIGSEGV is caused due to a branch to an invalid address an
+ // "Instruction Storage" interruption is generated and 'pc' (NIP) already
+ // contains the invalid address. Otherwise, the SIGSEGV is caused due to
+ // load/store instruction trying to load/store from/to an invalid address
+ // and causing a "Data Storage" interruption, so we inspect the intruction
+ // in order to extract the faulty data addresss.
+ address addr;
+ if ((ucontext_get_trap(uc) & 0x0F00 /* no IRQ reply bits */) == 0x0400) {
+ // Instruction interruption
+ addr = pc;
+ } else {
+ // Data interruption (0x0300): extract faulty data address
+ addr = ((NativeInstruction*)pc)->get_stack_bang_address(uc);
+ }
// Check if fault address is within thread stack.
if (thread->on_local_stack(addr)) {
--- a/src/hotspot/share/utilities/vmError.cpp Tue Mar 26 09:05:10 2019 -0400
+++ b/src/hotspot/share/utilities/vmError.cpp Tue Mar 26 15:25:13 2019 -0400
@@ -1725,7 +1725,16 @@
const char* const eol = os::line_separator();
const char* const msg = "this message should be truncated during formatting";
char * const dataPtr = NULL; // bad data pointer
- const void (*funcPtr)(void) = (const void(*)()) 0xF; // bad function pointer
+ const void (*funcPtr)(void); // bad function pointer
+
+#if defined(PPC64) && !defined(ABI_ELFv2)
+ struct FunctionDescriptor functionDescriptor;
+
+ functionDescriptor.set_entry((address) 0xF);
+ funcPtr = (const void(*)()) &functionDescriptor;
+#else
+ funcPtr = (const void(*)()) 0xF;
+#endif
// Keep this in sync with test/hotspot/jtreg/runtime/ErrorHandling/ErrorHandler.java
// which tests cases 1 thru 13.
--- a/src/java.base/share/classes/java/lang/module/Configuration.java Tue Mar 26 09:05:10 2019 -0400
+++ b/src/java.base/share/classes/java/lang/module/Configuration.java Tue Mar 26 15:25:13 2019 -0400
@@ -575,7 +575,8 @@
}
Set<ResolvedModule> reads(ResolvedModule m) {
- return Collections.unmodifiableSet(graph.get(m));
+ // The sets stored in the graph are already immutable sets
+ return Set.copyOf(graph.get(m));
}
/**
--- a/src/java.base/share/classes/java/net/ServerSocket.java Tue Mar 26 09:05:10 2019 -0400
+++ b/src/java.base/share/classes/java/net/ServerSocket.java Tue Mar 26 15:25:13 2019 -0400
@@ -749,14 +749,17 @@
* timeout must be {@code > 0}.
* A timeout of zero is interpreted as an infinite timeout.
* @param timeout the specified timeout, in milliseconds
- * @exception SocketException if there is an error in
- * the underlying protocol, such as a TCP error.
+ * @throws SocketException if there is an error in the underlying protocol,
+ * such as a TCP error
+ * @throws IllegalArgumentException if {@code timeout} is negative
* @since 1.1
* @see #getSoTimeout()
*/
public synchronized void setSoTimeout(int timeout) throws SocketException {
if (isClosed())
throw new SocketException("Socket is closed");
+ if (timeout < 0)
+ throw new IllegalArgumentException("timeout < 0");
getImpl().setOption(SocketOptions.SO_TIMEOUT, timeout);
}
--- a/src/java.base/share/classes/java/net/Socket.java Tue Mar 26 09:05:10 2019 -0400
+++ b/src/java.base/share/classes/java/net/Socket.java Tue Mar 26 15:25:13 2019 -0400
@@ -581,7 +581,8 @@
* if this socket has an associated channel,
* and the channel is in non-blocking mode
* @throws IllegalArgumentException if endpoint is null or is a
- * SocketAddress subclass not supported by this socket
+ * SocketAddress subclass not supported by this socket, or
+ * if {@code timeout} is negative
* @since 1.4
* @spec JSR-51
*/
@@ -1212,8 +1213,9 @@
* A timeout of zero is interpreted as an infinite timeout.
*
* @param timeout the specified timeout, in milliseconds.
- * @exception SocketException if there is an error
- * in the underlying protocol, such as a TCP error.
+ * @throws SocketException if there is an error in the underlying protocol,
+ * such as a TCP error
+ * @throws IllegalArgumentException if {@code timeout} is negative
* @since 1.1
* @see #getSoTimeout()
*/
--- a/src/java.base/windows/native/libnet/NetworkInterface_winXP.c Tue Mar 26 09:05:10 2019 -0400
+++ b/src/java.base/windows/native/libnet/NetworkInterface_winXP.c Tue Mar 26 15:25:13 2019 -0400
@@ -41,7 +41,7 @@
#ifdef _WIN64
printf ("nif:0x%I64x name:%s\n", (UINT_PTR)nif, nif->name);
#else
- printf ("nif:0x%x name:%s\n", nif, nif->name);
+ printf ("nif:0x%x name:%s\n", (UINT_PTR)nif, nif->name);
#endif
if (nif->dNameIsUnicode) {
printf ("dName:%S index:%d ", (unsigned short *)nif->displayName,
--- a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp Tue Mar 26 09:05:10 2019 -0400
+++ b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp Tue Mar 26 15:25:13 2019 -0400
@@ -502,7 +502,7 @@
else
{
if ((dwKeySpec & CERT_NCRYPT_KEY_SPEC) == CERT_NCRYPT_KEY_SPEC) {
- PP("CNG %I64d", hCryptProv);
+ PP("CNG %I64d", (__int64)hCryptProv);
} else {
// Private key is available
BOOL bGetUserKey = ::CryptGetUserKey(hCryptProv, dwKeySpec, &hUserKey); //deprecated
@@ -517,7 +517,7 @@
// Set cipher mode to ECB
DWORD dwCipherMode = CRYPT_MODE_ECB;
::CryptSetKeyParam(hUserKey, KP_MODE, (BYTE*)&dwCipherMode, NULL); //deprecated
- PP("CAPI %I64d %I64d", hCryptProv, hUserKey);
+ PP("CAPI %I64d %I64d", (__int64)hCryptProv, (__int64)hUserKey);
}
// If the private key is present in smart card, we may not be able to
// determine the key length by using the private key handle. However,
@@ -863,8 +863,8 @@
SS_CHECK(::NCryptTranslateHandle(
NULL,
&hk,
- hCryptProv,
- hCryptKey,
+ (HCRYPTPROV)hCryptProv,
+ (HCRYPTKEY)hCryptKey,
NULL,
0));
}
@@ -1087,8 +1087,8 @@
SS_CHECK(::NCryptTranslateHandle(
NULL,
&hk,
- hCryptProv,
- hCryptKey,
+ (HCRYPTPROV)hCryptProv,
+ (HCRYPTKEY)hCryptKey,
NULL,
0));
}
@@ -1920,7 +1920,7 @@
// Determine the size of the blob
if (hCryptKey == 0) {
SS_CHECK(::NCryptExportKey(
- hCryptProv, NULL, BCRYPT_ECCPUBLIC_BLOB,
+ (NCRYPT_KEY_HANDLE)hCryptProv, NULL, BCRYPT_ECCPUBLIC_BLOB,
NULL, NULL, 0, &dwBlobLen, NCRYPT_SILENT_FLAG));
} else {
if (! ::CryptExportKey((HCRYPTKEY) hCryptKey, 0, PUBLICKEYBLOB, 0, NULL, //deprecated
@@ -1939,7 +1939,7 @@
// Generate key blob
if (hCryptKey == 0) {
SS_CHECK(::NCryptExportKey(
- hCryptProv, NULL, BCRYPT_ECCPUBLIC_BLOB,
+ (NCRYPT_KEY_HANDLE)hCryptProv, NULL, BCRYPT_ECCPUBLIC_BLOB,
NULL, pbKeyBlob, dwBlobLen, &dwBlobLen, NCRYPT_SILENT_FLAG));
} else {
if (! ::CryptExportKey((HCRYPTKEY) hCryptKey, 0, PUBLICKEYBLOB, 0, //deprecated
--- a/test/hotspot/jtreg/compiler/codegen/TestOopCmp.java Tue Mar 26 09:05:10 2019 -0400
+++ b/test/hotspot/jtreg/compiler/codegen/TestOopCmp.java Tue Mar 26 15:25:13 2019 -0400
@@ -24,6 +24,7 @@
/**
* @test
* @bug 8221083
+ * @requires vm.gc.Serial
* @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
* @summary On ppc64, C1 erroneously emits a 32-bit compare instruction for oop compares.
* @modules java.base/jdk.internal.misc:+open
--- a/test/hotspot/jtreg/runtime/handshake/HandshakeSuspendExitTest.java Tue Mar 26 09:05:10 2019 -0400
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeSuspendExitTest.java Tue Mar 26 15:25:13 2019 -0400
@@ -42,9 +42,9 @@
while (!_exit_now) {
// Leave last 2 threads running.
for (int i = 0; i < _suspend_threads.length - 2; i++) {
- if (Thread.currentThread() != thr) {
- thr.suspend();
- thr.resume();
+ if (Thread.currentThread() != _suspend_threads[i]) {
+ _suspend_threads[i].suspend();
+ _suspend_threads[i].resume();
}
}
}
--- a/test/jdk/java/net/Socket/Timeouts.java Tue Mar 26 09:05:10 2019 -0400
+++ b/test/jdk/java/net/Socket/Timeouts.java Tue Mar 26 15:25:13 2019 -0400
@@ -85,8 +85,7 @@
}
/**
- * Test connect with a negative timeout. This case is not currently specified
- * but the long standing behavior is to throw IllegalArgumentException.
+ * Test connect with a negative timeout.
*/
public void testTimedConnect4() throws IOException {
try (ServerSocket ss = new ServerSocket(0)) {
@@ -393,8 +392,7 @@
}
/**
- * Test Socket setSoTimeout with a negative timeout. This case is not currently
- * specified but the long standing behavior is to throw IllegalArgumentException.
+ * Test Socket setSoTimeout with a negative timeout.
*/
@Test(expectedExceptions = { IllegalArgumentException.class })
public void testBadTimeout1() throws IOException {
@@ -404,9 +402,7 @@
}
/**
- * Test ServerSocket setSoTimeout with a negative timeout. This case is not
- * currently specified but the long standing behavior is to throw
- * IllegalArgumentException.
+ * Test ServerSocket setSoTimeout with a negative timeout.
*/
@Test(expectedExceptions = { IllegalArgumentException.class })
public void testBadTimeout2() throws IOException {