Mercurial > hg > openjdk > jdk8u > jdk
changeset 12860:1aa2e6ec537c jdk8u162-b09
Merge
author | asaha |
---|---|
date | Wed, 29 Nov 2017 13:06:32 -0800 |
parents | 05565880073c (current diff) 6ce72206b023 (diff) |
children | bd180c5c5462 |
files | .hgtags |
diffstat | 4 files changed, 16 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Nov 21 13:18:21 2017 -0800 +++ b/.hgtags Wed Nov 29 13:06:32 2017 -0800 @@ -830,6 +830,7 @@ 0000000000000000000000000000000000000000 jdk8u161-b07 22f4dc5bcb9955e02bb4e3b7fb847fd08339dd2d jdk8u161-b07 e7c79f48e83772546a1d35d98101853e2ca17947 jdk8u161-b08 +2c4e596e0cc3281fe976d9a730677c0a15113153 jdk8u161-b09 e03f9868f7df1e3db537f3b61704658e8a9dafb5 jdk8u162-b00 538bdf24383954cd2356e39e8081c2cb3ac27281 jdk8u162-b01 18e0bc77adafd0e5e459e381b6993bb0625b05be jdk8u162-b02
--- a/src/share/classes/java/awt/Toolkit.java Tue Nov 21 13:18:21 2017 -0800 +++ b/src/share/classes/java/awt/Toolkit.java Wed Nov 29 13:06:32 2017 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2017, 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 @@ -1656,7 +1656,9 @@ try { resources = ResourceBundle.getBundle("sun.awt.resources.awt", - CoreResourceBundleControl.getRBControlInstance()); + Locale.getDefault(), + ClassLoader.getSystemClassLoader(), + CoreResourceBundleControl.getRBControlInstance()); } catch (MissingResourceException e) { // No resource file; defaults will be used. }
--- a/src/share/classes/java/awt/Window.java Tue Nov 21 13:18:21 2017 -0800 +++ b/src/share/classes/java/awt/Window.java Wed Nov 29 13:06:32 2017 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2017, 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 @@ -2786,7 +2786,9 @@ */ @Deprecated public void applyResourceBundle(String rbName) { - applyResourceBundle(ResourceBundle.getBundle(rbName)); + applyResourceBundle(ResourceBundle.getBundle(rbName, + Locale.getDefault(), + ClassLoader.getSystemClassLoader())); } /*
--- a/src/share/classes/sun/security/tools/keytool/Resources.java Tue Nov 21 13:18:21 2017 -0800 +++ b/src/share/classes/sun/security/tools/keytool/Resources.java Wed Nov 29 13:06:32 2017 -0800 @@ -439,20 +439,20 @@ {"the.tsa.certificate", "The TSA certificate"}, {"the.input", "The input"}, {"reply", "Reply"}, - {"one.in.many", "%s #%d of %d"}, + {"one.in.many", "%1$s #%2$d of %3$d"}, {"alias.in.cacerts", "Issuer <%s> in cacerts"}, {"alias.in.keystore", "Issuer <%s>"}, {"with.weak", "%s (weak)"}, - {"key.bit", "%d-bit %s key"}, - {"key.bit.weak", "%d-bit %s key (weak)"}, + {"key.bit", "%1$d-bit %2$s key"}, + {"key.bit.weak", "%1$d-bit %2$s key (weak)"}, {".PATTERN.printX509Cert.with.weak", "Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nSignature algorithm name: {8}\nSubject Public Key Algorithm: {9}\nVersion: {10}"}, {"PKCS.10.with.weak", "PKCS #10 Certificate Request (Version 1.0)\n" + - "Subject: %s\nFormat: %s\nPublic Key: %s\nSignature algorithm: %s\n"}, - {"verified.by.s.in.s.weak", "Verified by %s in %s with a %s"}, - {"whose.sigalg.risk", "%s uses the %s signature algorithm which is considered a security risk."}, - {"whose.key.risk", "%s uses a %s which is considered a security risk."}, + "Subject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignature algorithm: %4$s\n"}, + {"verified.by.s.in.s.weak", "Verified by %1$s in %2$s with a %3$s"}, + {"whose.sigalg.risk", "%1$s uses the %2$s signature algorithm which is considered a security risk."}, + {"whose.key.risk", "%1$s uses a %2$s which is considered a security risk."}, {"jks.storetype.warning", "The %1$s keystore uses a proprietary format. It is recommended to migrate to PKCS12 which is an industry standard format using \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."}, {"migrate.keystore.warning", "Migrated \"%1$s\" to %4$s. The %2$s keystore is backed up as \"%3$s\"."}, {"backup.keystore.warning", "The original keystore \"%1$s\" is backed up as \"%3$s\"..."},