diff options
author | lana <none@none> | 2014-06-19 17:59:24 -0700 |
---|---|---|
committer | lana <none@none> | 2014-06-19 17:59:24 -0700 |
commit | 8b54e9ccad1cb3f69629dbd9a89b2306bebe03ef (patch) | |
tree | 7f5248cc52f1b5e282f1860125b77ad155c296fb | |
parent | 1b31b0a167e5e44ce9213e4ad3594598d143b0d3 (diff) | |
parent | def70819330e9157ec3c49a0b0bf8c5b0b5271ac (diff) |
Mergejdk8u20-b20
-rw-r--r-- | src/share/classes/org/omg/CORBA/ORB.java | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/share/classes/org/omg/CORBA/ORB.java b/src/share/classes/org/omg/CORBA/ORB.java index 0df6277..99197b2 100644 --- a/src/share/classes/org/omg/CORBA/ORB.java +++ b/src/share/classes/org/omg/CORBA/ORB.java @@ -291,28 +291,12 @@ abstract public class ORB { (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) |