Mercurial > hg > openjdk > jdk8u > corba
changeset 661:aca1d25d1081 jdk8u20-b20
Merge
author | lana |
---|---|
date | Thu, 19 Jun 2014 17:59:24 -0700 |
parents | 31bda0ce42b3 (current diff) 9739ba5d1b3a (diff) |
children | 7d1e0f0b63f1 3b5622505258 |
files | |
diffstat | 1 files changed, 1 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/org/omg/CORBA/ORB.java Wed Jun 18 12:34:09 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/ORB.java Thu Jun 19 17:59:24 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)