Mercurial > hg > release > icedtea7-forest-2.6 > jdk

changeset 9525:581773232054 icedtea-2.6.14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u181-b01
author andrew
date Thu, 17 May 2018 02:55:38 +0100
parents 3fa6e7c8dcde (current diff) 5687cff098b5 (diff)
children 742e02451a37
files .hgtags src/share/classes/java/lang/ClassLoader.java
diffstat 7 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 19 18:49:49 2018 +0100
+++ b/.hgtags	Thu May 17 02:55:38 2018 +0100
@@ -672,3 +672,4 @@
 68b6bb380175e4469e995a6c8a49a64a4c658cdc icedtea-2.6.13
 7ae89263e2c362312ec38041f456b52a0bfddc30 icedtea-2.6.14pre01
 9483a1259c9e24e766d449f085b015ef57736dd6 jdk7u181-b00
+18bac81b47784889754737181ff206995d36e97d jdk7u181-b01
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties	Thu Apr 19 18:49:49 2018 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties	Thu May 17 02:55:38 2018 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2018, 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
@@ -122,7 +122,7 @@
 crsreader.caldetected = En kalender har identifierats
 
 #CachedRowSetWriter exceptions
-crswriter.connect = Kan inte uppr\u00E4tta n\u00E5gon anslutning
+crswriter.connect = Kan inte uppr\u00E4tta anslutning
 crswriter.tname = writeData kan inte fastst\u00E4lla tabellnamnet
 crswriter.params1 = Parameterv\u00E4rde1: {0} 
 crswriter.params2 = Parameterv\u00E4rde2: {0} 
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties	Thu Apr 19 18:49:49 2018 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties	Thu May 17 02:55:38 2018 +0100
@@ -66,7 +66,7 @@
 FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan f\u00F6r filval
 FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil
 FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil
-FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglistan
+FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglista
 FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp f\u00F6r val av fil
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog
 
--- a/src/share/classes/java/lang/ClassLoader.java	Thu Apr 19 18:49:49 2018 +0100
+++ b/src/share/classes/java/lang/ClassLoader.java	Thu May 17 02:55:38 2018 +0100
@@ -188,6 +188,11 @@
     // must be added *after* it.
     private final ClassLoader parent;
 
+    // Used by ClassLoaderDependencies native class. This attribute is
+    // expected to be the 2nd instance attribute of ClassLoader class,
+    // according to java_lang_ClassLoader native class.
+    private final Object[] dependencies = new Object[2];
+
     /**
      * Encapsulates the set of parallel capable loader types.
      */
--- a/src/share/classes/sun/security/tools/keytool/Resources_de.java	Thu Apr 19 18:49:49 2018 +0100
+++ b/src/share/classes/sun/security/tools/keytool/Resources_de.java	Thu May 17 02:55:38 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -423,11 +423,11 @@
 
         // 8171319: keytool should print out warnings when reading or
         // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "Die Zertifikatsanforderung"},
+        {"the.certificate.request", "Die Zertifikatanforderung"},
         {"the.issuer", "Der Aussteller"},
         {"the.generated.certificate", "Das generierte Zertifikat"},
         {"the.generated.crl", "Die generierte CRL"},
-        {"the.generated.certificate.request", "Die generierte Zertifikatsanforderung"},
+        {"the.generated.certificate.request", "Die generierte Zertifikatanforderung"},
         {"the.certificate", "Das Zertifikat"},
         {"the.crl", "Die CRL"},
         {"the.tsa.certificate", "Das TSA-Zertifikat"},
@@ -442,7 +442,7 @@
         {".PATTERN.printX509Cert.with.weak",
                 "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatfingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nSignaturalgorithmusname: {8}\nAlgorithmus des Public Key von Betreff: {9}\nVersion: {10}"},
         {"PKCS.10.with.weak",
-                "PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
+                "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
         {"verified.by.s.in.s.weak", "Von %1$s in %2$s mit %3$s verifiziert"},
         {"whose.sigalg.risk", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko."},
         {"whose.key.risk", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko."},
--- a/src/share/classes/sun/security/tools/policytool/Resources_sv.java	Thu Apr 19 18:49:49 2018 +0100
+++ b/src/share/classes/sun/security/tools/policytool/Resources_sv.java	Thu May 17 02:55:38 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,7 +111,7 @@
             "Kan inte specificera identitetshavare utan namn"},
         {"Permission.and.Target.Name.must.have.a.value",
                 "Beh\u00F6righet och m\u00E5lnamn m\u00E5ste ha ett v\u00E4rde"},
-        {"Remove.this.Policy.Entry.", "Vill du ta bort den h\u00E4r policyposten?"},
+        {"Remove.this.Policy.Entry.", "Vill du ta bort policyposten?"},
         {"Overwrite.File", "Skriv \u00F6ver fil"},
         {"Policy.successfully.written.to.filename",
                 "Policy har skrivits till {0}"},
--- a/src/share/classes/sun/security/util/Resources_sv.java	Thu Apr 19 18:49:49 2018 +0100
+++ b/src/share/classes/sun/security/util/Resources_sv.java	Thu May 17 02:55:38 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -36,7 +36,7 @@
 
         // javax.security.auth.PrivateCredentialPermission
         {"invalid.null.input.s.", "ogiltiga null-indata"},
-        {"actions.can.only.be.read.", "funktioner kan endast 'l\u00E4sas'"},
+        {"actions.can.only.be.read.", "\u00E5tg\u00E4rder kan endast 'l\u00E4sas'"},
         {"permission.name.name.syntax.invalid.",
                 "syntaxen f\u00F6r beh\u00F6righetsnamnet [{0}] \u00E4r ogiltig: "},
         {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",