Mercurial > hg > icedtea7-forest-aarch64 > corba
changeset 1107:ed3b2186743f
Merge
author | asaha |
---|---|
date | Tue, 17 Jun 2014 15:30:27 -0700 |
parents | ce0530793551 (current diff) 9fd301a563a7 (diff) |
children | 50e4090a8583 |
files | .hgtags |
diffstat | 2 files changed, 5 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jun 04 21:04:37 2014 -0700 +++ b/.hgtags Tue Jun 17 15:30:27 2014 -0700 @@ -465,6 +465,8 @@ b95f46ae5207853a89d52b0453a2fb99fffee817 jdk7u65-b13 6efadedfe3295dbf2af4a350d813524af029b116 jdk7u65-b14 78966cf34d868ef18b8a3fa7edec368e1cc4739d jdk7u65-b15 +d765ed30bd5ed2bdd71fda56c056333e1b4b0d7d jdk7u65-b16 +cd642d59aca29ff2b56e7ed016be758828f199cd jdk7u65-b17 5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u66-b00 9f0f0bdd4cfb01a5d64f9528b7ffda3974171120 jdk7u66-b01 596d979a5d4deb9d10b068479276cd4b2a12432e jdk7u66-b09 @@ -474,4 +476,6 @@ d0d039a1eca081bc05e833dfc027df1aa1bd018a jdk7u66-b13 1e46e65dd58db00180f1ccaaae93ae7946b22d29 jdk7u66-b14 f2c867d52b393e661216057f0b559ef3fd122530 jdk7u66-b15 +3039f266eef2ba54ec2869d87adac6e395c82fe9 jdk7u66-b16 +0b46b93a61966e8d2332f1d3899d7c858a653d91 jdk7u66-b17 fd1c9030a08d513b5a477f82a46855bb6a9cacac jdk7u71-b00
--- a/src/share/classes/org/omg/CORBA/ORB.java Wed Jun 04 21:04:37 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/ORB.java Tue Jun 17 15:30:27 2014 -0700 @@ -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)