Mercurial > hg > openjdk > aarch64-port > corba
changeset 733:6ce7f0f15f67 jdk8u40-b02
Merge
author | aph |
---|---|
date | Thu, 04 Sep 2014 12:43:07 -0400 |
parents | 50c3c48949dc (current diff) 504b4455570e (diff) |
children | d5a93571f16a |
files | .hgtags src/share/classes/org/omg/CORBA/ORB.java |
diffstat | 5 files changed, 42 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jun 05 13:06:59 2014 +0100 +++ b/.hgtags Thu Sep 04 12:43:07 2014 -0400 @@ -269,6 +269,7 @@ c750098a3ef18de28a6d739666559f0333c76c78 jdk8u5-b02 3d9b40a53134aa33031bf13581dff9fccade9048 jdk8u5-b03 596f4e4c5587c29767345555c4e48a5be0a58b83 jdk8u5-b04 +1f95c888e5efe010550d95ef59020ddb15876463 jdk8u11-b00 1f95c888e5efe010550d95ef59020ddb15876463 jdk8u5-b05 edfa8bc86fda1b2fd064abbafb4506c80a47587e jdk8u5-b06 0a25d1c162bc046aa230577736429935716a2243 jdk8u5-b07 @@ -278,6 +279,20 @@ a2f7b36bfc1bc8df033fe5721b48fac1c3928a5b jdk8u5-b11 475b96f6d8cecf720ca9fd6d332dd4bafb0f654c jdk8u5-b12 897088ef059f53a8aa73267985666ad319223064 jdk8u5-b13 +0355626e88639a9b51b209f26f48dee28c924c72 jdk8u5-b31 +e2cfebaf3b9d0eae06c2d5ee7669180f1723f897 jdk8u11-b01 +152d1b91e5c5dfc940cccef1bfeae60a6604032a jdk8u11-b02 +60b073836311720d4f013d4493af2729ebe663f6 jdk8u11-b03 +4a0c834de2827b753e5ba2972ca3d9125a5c80eb jdk8u11-b04 +08aa9f55fe5bce1f04cfd2958f71e8df18643e29 jdk8u11-b05 +d6f052f3ad5d9244452d40236efdabe13be24716 jdk8u11-b06 +3052e1208958022173a6bf752edb88c7ad188797 jdk8u11-b07 +fff1b1687ed60d3d398b3d55c0dc71ee3450a601 jdk8u11-b08 +f846c0c1c330545b8a85fc05a36fa95f48757525 jdk8u11-b09 +3e4b895d06e8d292f7338aa2155849173722062f jdk8u11-b10 +ce324096c5626997634df1e5fa68f206909431ab jdk8u11-b11 +c4d817051c6a620a4f748e9e057423a774f172c7 jdk8u11-b12 +c79def3415b9c36e925d71d247de6bf60240a29b jdk8u11-b31 bfafb13aac1c8b2d9184d59ec510b45d965b7667 jdk8u20-b02 9059a1c857044ad5ce7564ddb71a064364f8fcf5 jdk8u20-b03 abe5b0157c367a72f9059269ca633ecfe15732d2 jdk8u20-b04 @@ -296,3 +311,12 @@ 1680797c869e6e6df965c83a854fe7633ab94aa7 jdk8u20-b14 5949c13039299a0052343e81bb7da2e2068282fa jdk8u20-b15 db1b47c1102e31fe649e0ca13a85dc4f13281df4 jdk8u20-b16 +90a428aa799d843cfc923031bd79f9e3896b49fa jdk8u20-b17 +2c5113522ce5b887ce060b6accf225095349fc3c jdk8u20-b18 +b078cb18ef95fe1afeacab70c2c313b6abbc959c jdk8u20-b19 +aca1d25d10812c86024d9dbb7ec529876cca55e8 jdk8u20-b20 +7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u20-b21 +7677bf14d105ca23ab045f5041ceb19ee88b86c6 jdk8u20-b22 +919405d7316dfcbddee5ad8dd08905916df88e04 jdk8u20-b23 +7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u40-b00 +c5d9822a3c18cd9e274dfe99e91c33e02bd8f8f4 jdk8u40-b01
--- a/THIRD_PARTY_README Thu Jun 05 13:06:59 2014 +0100 +++ b/THIRD_PARTY_README Thu Sep 04 12:43:07 2014 -0400 @@ -2,7 +2,7 @@ ----------------------------- %% This notice is provided with respect to ASM Bytecode Manipulation -Framework v5.0, which may be included with JRE 8, and JDK 8, and +Framework v5.0.3, which may be included with JRE 8, and JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1471,7 +1471,7 @@ version 2.0. The NSS libraries are supplied in executable form, built from unmodified -NSS source code labeled with the "NSS_3.13.1_RTM" release tag. +NSS source code labeled with the "NSS_3_16_RTM" HG tag. The NSS source code is available in the OpenJDK source code repository at: jdk/test/sun/security/pkcs11/nss/src @@ -3349,14 +3349,14 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.5, which may be included +%% This notice is provided with respect to zlib v1.2.8, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.5, July 18th, 2005 - - Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler + version 1.2.8, April 28th, 2013 + + Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -3382,11 +3382,11 @@ ------------------------------------------------------------------------------- %% This notice is provided with respect to the following which may be -included with JRE 8, JDK 8, and OpenJDK 8, except where noted: - - Apache Commons Math 2.2 - Apache Derby 10.10.1.2 [included with JDK 8] - Apache Jakarta BCEL 5.2 +included with JRE 8, JDK 8, and OpenJDK 8. + + Apache Commons Math 3.2 + Apache Derby 10.10.1.3 + Apache Jakarta BCEL 5.1 Apache Jakarta Regexp 1.4 Apache Santuario XML Security for Java 1.5.4 Apache Xalan-Java 2.7.1
--- a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Thu Jun 05 13:06:59 2014 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java Thu Sep 04 12:43:07 2014 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, 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 @@ -35,7 +35,8 @@ import java.io.OutputStream; import java.io.ObjectOutputStream; import java.io.ObjectOutput; -import java.util.Hashtable; +import java.util.Map; +import java.util.HashMap; import org.omg.CORBA.INTERNAL; @@ -49,7 +50,7 @@ */ private class HookPutFields extends ObjectOutputStream.PutField { - private Hashtable fields = new Hashtable(); + private Map<String,Object> fields = new HashMap<>(); /** * Put the value of the named boolean field into the persistent field. @@ -140,7 +141,6 @@ public OutputStreamHook() throws java.io.IOException { super(); - } public void defaultWriteObject() throws IOException {
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties Thu Jun 05 13:06:59 2014 +0100 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties Thu Sep 04 12:43:07 2014 -0400 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2014, 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 @@ -95,7 +95,7 @@ bootstrap.exception=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4FDD\u5B58\u4E2D\u306B\u4F8B\u5916\u3092\u6355\u6349\u3057\u307E\u3057\u305F: \u4F8B\u5916{1} tnameserv.exception=\u30DD\u30FC\u30C8{0}\u3067\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30B5\u30FC\u30D3\u30B9\u3092\u8D77\u52D5\u4E2D\u306B\u4F8B\u5916\u3092\u6355\u6349\u3057\u307E\u3057\u305F -tnameserv.usage=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570-ORBInitialPort<portno>\u3092\u4F7F\u7528\u3057\u3066\u5225\u306E\u30DD\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044 +tnameserv.usage=\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570-ORBInitialPort<portno>\u3092\u4F7F\u7528\u3057\u3066\u5225\u306E\u30DD\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044 tnameserv.invalidhostoption=ORBInitialHost\u306FNameService\u306B\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093 tnameserv.orbinitialport0=ORBInitialPort 0\u306FNameService\u306B\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093 tnameserv.hs1=\u521D\u671F\u30CD\u30FC\u30DF\u30F3\u30B0\u30FB\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8:\n{0}
--- a/src/share/classes/org/omg/CORBA/ORB.java Thu Jun 05 13:06:59 2014 +0100 +++ b/src/share/classes/org/omg/CORBA/ORB.java Thu Sep 04 12:43:07 2014 -0400 @@ -291,28 +291,12 @@ (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) { singleton = new com.sun.corba.se.impl.orb.ORBSingleton(); } else { - singleton = create_impl_with_systemclassloader(className); + singleton = create_impl(className); } } return singleton; } - private static ORB create_impl_with_systemclassloader(String className) { - - try { - ReflectUtil.checkPackageAccess(className); - ClassLoader cl = ClassLoader.getSystemClassLoader(); - Class<org.omg.CORBA.ORB> orbBaseClass = org.omg.CORBA.ORB.class; - Class<?> singletonOrbClass = Class.forName(className, true, cl).asSubclass(orbBaseClass); - return (ORB)singletonOrbClass.newInstance(); - } catch (Throwable ex) { - SystemException systemException = new INITIALIZE( - "can't instantiate default ORB implementation " + className); - systemException.initCause(ex); - throw systemException; - } - } - private static ORB create_impl(String className) { ClassLoader cl = Thread.currentThread().getContextClassLoader(); if (cl == null)